Fixed bug in exception creation.

[rails.git] / app / controllers / amf_controller.rb

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 1ee5e9cee2b14beacc1552c409694583dd1075c4..9d9a91f5398195d9fb7b2df5f2108191b0820d49 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -41,7 +41,7 @@ class AmfController < ApplicationController
   include MapBoundary
 
   session :off
   include MapBoundary
 
   session :off

-  before_filter :check_write_availability
+  before_filter :check_api_writable

 
   # Main AMF handlers: process the raw AMF string (using AMF library) and
   # calls each action (private method) accordingly.
 
   # Main AMF handlers: process the raw AMF string (using AMF library) and
   # calls each action (private method) accordingly.


@@ -55,7 +55,7 @@ class AmfController < ApplicationController
 
     # Parse request
 
 
     # Parse request
 

-    headers=AMF.getint(req)                                    # Read number of headers
+       headers=AMF.getint(req)                                 # Read number of headers

 
     headers.times do                                           # Read each header
       name=AMF.getstring(req)                          #  |
 
     headers.times do                                           # Read each header
       name=AMF.getstring(req)                          #  |


@@ -76,7 +76,8 @@ class AmfController < ApplicationController
         when 'getpresets';                     results[index]=AMF.putdata(index,getpresets())
         when 'whichways';                      results[index]=AMF.putdata(index,whichways(*args))
         when 'whichways_deleted';      results[index]=AMF.putdata(index,whichways_deleted(*args))
         when 'getpresets';                     results[index]=AMF.putdata(index,getpresets())
         when 'whichways';                      results[index]=AMF.putdata(index,whichways(*args))
         when 'whichways_deleted';      results[index]=AMF.putdata(index,whichways_deleted(*args))

-        when 'getway';                         results[index]=AMF.putdata(index,getway(args[0].to_i))
+        when 'getway';                         r=AMF.putdata(index,getway(args[0].to_i))
+                                    results[index]=r

         when 'getrelation';                    results[index]=AMF.putdata(index,getrelation(args[0].to_i))
         when 'getway_old';                     results[index]=AMF.putdata(index,getway_old(args[0].to_i,args[1]))
         when 'getway_history';         results[index]=AMF.putdata(index,getway_history(args[0].to_i))
         when 'getrelation';                    results[index]=AMF.putdata(index,getrelation(args[0].to_i))
         when 'getway_old';                     results[index]=AMF.putdata(index,getway_old(args[0].to_i,args[1]))
         when 'getway_history';         results[index]=AMF.putdata(index,getway_history(args[0].to_i))


@@ -219,7 +220,7 @@ class AmfController < ApplicationController
     [0, ways, points, relations]
 
   rescue Exception => err
     [0, ways, points, relations]
 
   rescue Exception => err

-    [-2,"Sorry - I can't get the map for that area."]
+    [-2,"Sorry - I can't get the map for that area. The server said: #{err}"]

   end
 
   # Find deleted ways in current bounding box (similar to whichways, but ways
   end
 
   # Find deleted ways in current bounding box (similar to whichways, but ways


@@ -235,7 +236,7 @@ class AmfController < ApplicationController
     begin
       check_boundaries(xmin, ymin, xmax, ymax)
     rescue Exception => err
     begin
       check_boundaries(xmin, ymin, xmax, ymax)
     rescue Exception => err

-      return [-2,"Sorry - I can't get the map for that area."]
+      return [-2,"Sorry - I can't get the map for that area. The server said: #{err}"]

     end
 
     nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_ways.visible = ?", false], :include => :ways_via_history)
     end
 
     nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_ways.visible = ?", false], :include => :ways_via_history)


@@ -276,7 +277,7 @@ class AmfController < ApplicationController
 
     [wayid, points, tags, version]
   end
 
     [wayid, points, tags, version]
   end

-
+  

   # Get an old version of a way, and all constituent nodes.
   #
   # For undelete (version<0), always uses the most recent version of each node, 
   # Get an old version of a way, and all constituent nodes.
   #
   # For undelete (version<0), always uses the most recent version of each node, 


@@ -435,12 +436,12 @@ class AmfController < ApplicationController
     if searchterm.to_i>0 then
       rel = Relation.find(searchterm.to_i)
       if rel and rel.visible then
     if searchterm.to_i>0 then
       rel = Relation.find(searchterm.to_i)
       if rel and rel.visible then

-        rels.push([rel.id, rel.tags, rel.members])
+        rels.push([rel.id, rel.tags, rel.members, rel.version])

       end
     else
       RelationTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", searchterm] ).each do |t|
       if t.relation.visible then
       end
     else
       RelationTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", searchterm] ).each do |t|
       if t.relation.visible then

-             rels.push([t.relation.id, t.relation.tags, t.relation.members])
+             rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version])

            end
          end
        end
            end
          end
        end


@@ -451,7 +452,8 @@ class AmfController < ApplicationController
   # Returns
   # 0. 0 (success),
   # 1. original relation id (unchanged),
   # Returns
   # 0. 0 (success),
   # 1. original relation id (unchanged),

-  # 2. new relation id.
+  # 2. new relation id,
+  # 3. version.

 
   def putrelation(renumberednodes, renumberedways, usertoken, changeset_id, version, relid, tags, members, visible) #:doc:
     user = getuser(usertoken)
 
   def putrelation(renumberednodes, renumberedways, usertoken, changeset_id, version, relid, tags, members, visible) #:doc:
     user = getuser(usertoken)


@@ -475,8 +477,8 @@ class AmfController < ApplicationController
       members.each do |m|
         mid = m[1].to_i
         if mid < 0
       members.each do |m|
         mid = m[1].to_i
         if mid < 0

-          mid = renumberednodes[mid] if m[0] == 'node'
-          mid = renumberedways[mid] if m[0] == 'way'
+          mid = renumberednodes[mid] if m[0] == 'Node'
+          mid = renumberedways[mid] if m[0] == 'Way'

         end
         if mid
           typedmembers << [m[0], mid, m[2]]
         end
         if mid
           typedmembers << [m[0], mid, m[2]]


@@ -490,7 +492,6 @@ class AmfController < ApplicationController
       new_relation.changeset_id = changeset_id
       new_relation.version = version
 
       new_relation.changeset_id = changeset_id
       new_relation.version = version
 

-      # NOTE: id or relid here? id doesn't seem to be set above

       if relid <= 0
         # We're creating the node
         new_relation.create_with_history(user)
       if relid <= 0
         # We're creating the node
         new_relation.create_with_history(user)


@@ -503,10 +504,10 @@ class AmfController < ApplicationController
       end
     end # transaction
       
       end
     end # transaction
       

-    if id <= 0
+    if relid <= 0

       return [0, relid, new_relation.id, new_relation.version]
     else
       return [0, relid, new_relation.id, new_relation.version]
     else

-      return [0, relid, relation.id, relation.version]
+      return [0, relid, relid, relation.version]

     end
   rescue OSM::APIChangesetAlreadyClosedError => ex
     return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}."]
     end
   rescue OSM::APIChangesetAlreadyClosedError => ex
     return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}."]


@@ -514,12 +515,12 @@ class AmfController < ApplicationController
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different

-    return [-3, "Sorry, someone else has changed this relation since you started editing. Please click the 'Edit' tab to reload the area."]
+    return [-3, "Sorry, someone else has changed this relation since you started editing. Please click the 'Edit' tab to reload the area. The server said: #{ex}"]

   rescue OSM::APIAlreadyDeletedError => ex
     return [-1, "The relation has already been deleted."]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
   rescue OSM::APIAlreadyDeletedError => ex
     return [-1, "The relation has already been deleted."]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch

-    return [-2, "Something really bad happened :-( ."]
+    return [-2, "An unusual error happened (in 'putrelation' #{relid}). The server said: #{ex}"]

   end
 
   # Save a way to the database, including all nodes. Any nodes in the previous
   end
 
   # Save a way to the database, including all nodes. Any nodes in the previous


@@ -620,7 +621,7 @@ class AmfController < ApplicationController
       uniques=uniques-pointlist
       uniques.each do |n|
         node = Node.find(n)
       uniques=uniques-pointlist
       uniques.each do |n|
         node = Node.find(n)

-        deleteitemrelations(user, changeset_id, id, 'node', node.version)
+        deleteitemrelations(user, changeset_id, id, 'Node', node.version)

         new_node = Node.new
         new_node.changeset_id = changeset_id
         new_node.version = node.version
         new_node = Node.new
         new_node.changeset_id = changeset_id
         new_node.version = node.version


@@ -636,14 +637,14 @@ class AmfController < ApplicationController
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different

-    return [-3, "Sorry, someone else has changed this way since you started editing. Please click the 'Edit' tab to reload the area."]
+    return [-3, "Sorry, someone else has changed this way since you started editing. Click the 'Edit' tab to reload the area. The server said: #{ex}"]

   rescue OSM::APITooManyWayNodesError => ex
     return [-1, "You have tried to upload a really long way with #{ex.provided} points: only #{ex.max} are allowed."]
   rescue OSM::APIAlreadyDeletedError => ex
     return [-1, "The point has already been deleted."]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
   rescue OSM::APITooManyWayNodesError => ex
     return [-1, "You have tried to upload a really long way with #{ex.provided} points: only #{ex.max} are allowed."]
   rescue OSM::APIAlreadyDeletedError => ex
     return [-1, "The point has already been deleted."]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch

-    return [-2, "Something really bad happened :-(."]
+    return [-2, "An unusual error happened (in 'putway' #{originalway}). The server said: #{ex}"]

   end
 
   # Save POI to the database.
   end
 
   # Save POI to the database.


@@ -701,28 +702,28 @@ class AmfController < ApplicationController
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different
     # Really need to check to see whether this is a server load issue, and the 
     # last version was in the same changeset, or belongs to the same user, then
     # we can return something different

-    return [-3, "Sorry, someone else has changed this point since you started editing. Please click the 'Edit' tab to reload the area."]
+    return [-3, "Sorry, someone else has changed this point since you started editing. Please click the 'Edit' tab to reload the area. The server said: #{ex}"]

   rescue OSM::APIAlreadyDeletedError => ex
     return [-1, "The point has already been deleted"]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
   rescue OSM::APIAlreadyDeletedError => ex
     return [-1, "The point has already been deleted"]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch

-    return [-2, "Something really bad happened :-()"]
+    return [-2, "An unusual error happened (in 'putpoi' #{id}). The server said: #{ex}"]

   end
 
   # Read POI from database
   # (only called on revert: POIs are usually read by whichways).
   #
   end
 
   # Read POI from database
   # (only called on revert: POIs are usually read by whichways).
   #

-  # Returns array of id, long, lat, hash of tags, version.
+  # Returns array of id, long, lat, hash of tags, (current) version.

 
   def getpoi(id,timestamp) #:doc:
 
   def getpoi(id,timestamp) #:doc:

-    if timestamp == '' then
-      n = Node.find(id)
-    else
+    n = Node.find(id)
+    v = n.version
+    unless timestamp == ''

       n = OldNode.find(id, :conditions=>['timestamp=?',DateTime.strptime(timestamp, "%d %b %Y, %H:%M:%S")])
     end
 
     if n
       n = OldNode.find(id, :conditions=>['timestamp=?',DateTime.strptime(timestamp, "%d %b %Y, %H:%M:%S")])
     end
 
     if n

-      return [n.id, n.lon, n.lat, n.tags, n.version]
+      return [n.id, n.lon, n.lat, n.tags, v]

     else
       return [nil, nil, nil, {}, nil]
     end
     else
       return [nil, nil, nil, {}, nil]
     end


@@ -748,12 +749,13 @@ class AmfController < ApplicationController
 
       # delete the way
       old_way = Way.find(way_id)
 
       # delete the way
       old_way = Way.find(way_id)

+      u = old_way.unshared_node_ids

       delete_way = Way.new
       delete_way.version = way_version
       delete_way.changeset_id = changeset_id
       old_way.delete_with_history!(delete_way, user)
 
       delete_way = Way.new
       delete_way.version = way_version
       delete_way.changeset_id = changeset_id
       old_way.delete_with_history!(delete_way, user)
 

-      old_way.unshared_node_ids.each do |node_id|
+      u.each do |node_id|

         # delete the node
         node = Node.find(node_id)
         delete_node = Node.new
         # delete the node
         node = Node.find(node_id)
         delete_node = Node.new


@@ -763,7 +765,7 @@ class AmfController < ApplicationController
         else
           # in case the node wasn't passed (i.e. if it was previously removed
           # from the way in Potlatch)
         else
           # in case the node wasn't passed (i.e. if it was previously removed
           # from the way in Potlatch)

-          deleteitemrelations(user, changeset_id, node_id, 'node', node.version)
+          deleteitemrelations(user, changeset_id, node_id, 'Node', node.version)

              delete_node.version = node.version
            end
         node.delete_with_history!(delete_node, user)
              delete_node.version = node.version
            end
         node.delete_with_history!(delete_node, user)


@@ -781,7 +783,7 @@ class AmfController < ApplicationController
     return [-1, "The way has already been deleted."]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch
     return [-1, "The way has already been deleted."]
   rescue OSM::APIError => ex
     # Some error that we don't specifically catch

-    return [-2, "Something really bad happened :-( ."]
+    return [-2, "An unusual error happened (in 'deleteway' #{way_id}). The server said: #{ex}"]

   end
 
 
   end
 
 


@@ -795,7 +797,7 @@ class AmfController < ApplicationController
 
   def deleteitemrelations(user, changeset_id, objid, type, version) #:doc:
     relations = RelationMember.find(:all, 
 
   def deleteitemrelations(user, changeset_id, objid, type, version) #:doc:
     relations = RelationMember.find(:all, 

-                                                                       :conditions => ['member_type = ? and member_id = ?', type, objid], 
+                                                                       :conditions => ['member_type = ? and member_id = ?', type.classify, objid], 

                                                                        :include => :relation).collect { |rm| rm.relation }.uniq
 
     relations.each do |rel|
                                                                        :include => :relation).collect { |rm| rm.relation }.uniq
 
     relations.each do |rel|


@@ -883,7 +885,7 @@ class AmfController < ApplicationController
       SELECT DISTINCT cr.id AS relid,cr.version AS version 
       FROM current_relations cr
       INNER JOIN current_relation_members crm ON crm.id=cr.id 
       SELECT DISTINCT cr.id AS relid,cr.version AS version 
       FROM current_relations cr
       INNER JOIN current_relation_members crm ON crm.id=cr.id 

-      INNER JOIN current_nodes cn ON crm.member_id=cn.id AND crm.member_type='node' 
+      INNER JOIN current_nodes cn ON crm.member_id=cn.id AND crm.member_type='Node' 

        WHERE #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "cn.")}
       EOF
     unless way_ids.empty?
        WHERE #{OSM.sql_for_area(ymin, xmin, ymax, xmax, "cn.")}
       EOF
     unless way_ids.empty?


@@ -892,17 +894,17 @@ class AmfController < ApplicationController
         SELECT DISTINCT cr.id AS relid,cr.version AS version
         FROM current_relations cr
         INNER JOIN current_relation_members crm ON crm.id=cr.id
         SELECT DISTINCT cr.id AS relid,cr.version AS version
         FROM current_relations cr
         INNER JOIN current_relation_members crm ON crm.id=cr.id

-         WHERE crm.member_type='way' 
+         WHERE crm.member_type='Way' 

          AND crm.member_id IN (#{way_ids.join(',')})
         EOF
     end
          AND crm.member_id IN (#{way_ids.join(',')})
         EOF
     end

-    return ActiveRecord::Base.connection.select_all(sql).collect { |a| [a['relid'].to_i,a['version'].to_i] }
+    ActiveRecord::Base.connection.select_all(sql).collect { |a| [a['relid'].to_i,a['version'].to_i] }

   end
        
   def sql_get_nodes_in_way(wayid)
     points=[]
     sql=<<-EOF
   end
        
   def sql_get_nodes_in_way(wayid)
     points=[]
     sql=<<-EOF

-      SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,current_nodes.id 
+      SELECT latitude*0.0000001 AS lat,longitude*0.0000001 AS lon,current_nodes.id,current_nodes.version 

       FROM current_way_nodes,current_nodes 
        WHERE current_way_nodes.id=#{wayid.to_i} 
                   AND current_way_nodes.node_id=current_nodes.id 
       FROM current_way_nodes,current_nodes 
        WHERE current_way_nodes.id=#{wayid.to_i} 
                   AND current_way_nodes.node_id=current_nodes.id 


@@ -915,7 +917,7 @@ class AmfController < ApplicationController
         nodetags[n['k']]=n['v']
       end
       nodetags.delete('created_by')
         nodetags[n['k']]=n['v']
       end
       nodetags.delete('created_by')

-      points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nodetags]
+      points << [row['lon'].to_f,row['lat'].to_f,row['id'].to_i,nodetags,row['version'].to_i]

     end
     points
   end
     end
     points
   end