X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c0b4c1b9059890e1fb683a9822b966d4efd2698c..e5674abd2c9b0359b06c281804f7286e22b9a258:/app/controllers/amf_controller.rb

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 9c9f85e1d..b18ebe346 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -163,21 +163,27 @@ class AmfController < ApplicationController
     return POTLATCH_PRESETS
   end
 
+  ##
   # Find all the ways, POI nodes (i.e. not part of ways), and relations
   # in a given bounding box. Nodes are returned in full; ways and relations 
   # are IDs only. 
-
+  #
+  # return is of the form: 
+  # [error_code, 
+  #  [[way_id, way_version], ...],
+  #  [[node_id, lat, lon, [tags, ...], node_version], ...],
+  #  [[rel_id, rel_version], ...]]
+  # where the ways are any visible ways which refer to any visible
+  # nodes in the bbox, nodes are any visible nodes in the bbox but not
+  # used in any way, rel is any relation which refers to either a way
+  # or node that we're returning.
   def whichways(xmin, ymin, xmax, ymax) #:doc:
     xmin -= 0.01; ymin -= 0.01
     xmax += 0.01; ymax += 0.01
     
     # check boundary is sane and area within defined
     # see /config/application.yml
-    begin
-      check_boundaries(xmin, ymin, xmax, ymax)
-    rescue Exception => err
-      return [-2,"Sorry - I can't get the map for that area."]
-    end
+    check_boundaries(xmin, ymin, xmax, ymax)
 
     if POTLATCH_USE_SQL then
       ways = sql_find_ways_in_area(xmin, ymin, xmax, ymax)
@@ -186,14 +192,15 @@ class AmfController < ApplicationController
     else
       # find the way ids in an area
       nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_nodes.visible = ?", true], :include => :ways)
-      ways = nodes_in_area.collect { |node| 
-        node.ways.collect { |w| [w.id,w.version] }.flatten
+      ways = nodes_in_area.inject([]) { |sum, node| 
+        visible_ways = node.ways.select { |w| w.visible? }
+        sum + visible_ways.collect { |w| [w.id,w.version] }
       }.uniq
       ways.delete([])
 
       # find the node ids in an area that aren't part of ways
       nodes_not_used_in_area = nodes_in_area.select { |node| node.ways.empty? }
-      points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags] }
+      points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags, n.version] }
 
       # find the relations used by those nodes and ways
       relations = Relation.find_for_nodes(nodes_in_area.collect { |n| n.id }, :conditions => {:visible => true}) +
@@ -202,6 +209,9 @@ class AmfController < ApplicationController
     end
 
     [0,ways, points, relations]
+
+  rescue Exception => err
+    [-2,"Sorry - I can't get the map for that area."]
   end
 
   # Find deleted ways in current bounding box (similar to whichways, but ways
@@ -313,18 +323,16 @@ class AmfController < ApplicationController
   # an array of previous versions.
 
   def getnode_history(nodeid) #:doc:
-    begin
-	  history = Node.find(nodeid).old_nodes.reverse.collect do |old_node|
-        user_object = old_node.changeset.user
-        user = user_object.data_public? ? user_object.display_name : 'anonymous'
-        uid  = user_object.data_public? ? user_object.id : 0
-        [old_node.version, old_node.timestamp.strftime("%d %b %Y, %H:%M"), old_node.visible ? 1 : 0, user, uid]
-      end
-
-      return ['node',nodeid,history]
-    rescue ActiveRecord::RecordNotFound
-      return ['node', nodeid, []]
+    history = Node.find(nodeid).old_nodes.reverse.collect do |old_node|
+      user_object = old_node.changeset.user
+      user = user_object.data_public? ? user_object.display_name : 'anonymous'
+      uid  = user_object.data_public? ? user_object.id : 0
+      [old_node.version, old_node.timestamp.strftime("%d %b %Y, %H:%M"), old_node.visible ? 1 : 0, user, uid]
     end
+    
+    return ['node',nodeid,history]
+  rescue ActiveRecord::RecordNotFound
+    return ['node', nodeid, []]
   end
 
   # Find GPS traces with specified name/id.
@@ -399,44 +407,46 @@ class AmfController < ApplicationController
     relid = relid.to_i
     visible = (visible.to_i != 0)
 
-    # create a new relation, or find the existing one
-    if relid > 0
-      relation = Relation.find(relid)
-    end
-    # We always need a new node, based on the data that has been sent to us
-    new_relation = Relation.new
-
-    # check the members are all positive, and correctly type
-    typedmembers = []
-    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'
+    Relation.transaction do
+      # create a new relation, or find the existing one
+      if relid > 0
+        relation = Relation.find(relid)
       end
-      if mid
-        typedmembers << [m[0], mid, m[2]]
+      # We always need a new node, based on the data that has been sent to us
+      new_relation = Relation.new
+
+      # check the members are all positive, and correctly type
+      typedmembers = []
+      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'
+        end
+        if mid
+          typedmembers << [m[0], mid, m[2]]
+        end
       end
-    end
 
-    # assign new contents
-    new_relation.members = typedmembers
-    new_relation.tags = tags
-    new_relation.visible = visible
-    new_relation.changeset_id = changeset
-    new_relation.version = version
+      # assign new contents
+      new_relation.members = typedmembers
+      new_relation.tags = tags
+      new_relation.visible = visible
+      new_relation.changeset_id = changeset
+      new_relation.version = version
 
 
-    if id <= 0
-      # We're creating the node
-      new_relation.create_with_history(user)
-    elsif visible
-      # We're updating the node
-      relation.update_from(new_relation, user)
-    else
-      # We're deleting the node
-      relation.delete_with_history!(new_relation, user)
-    end
+      if id <= 0
+        # We're creating the node
+        new_relation.create_with_history(user)
+      elsif visible
+        # We're updating the node
+        relation.update_from(new_relation, user)
+      else
+        # We're deleting the node
+        relation.delete_with_history!(new_relation, user)
+      end
+    end # transaction
       
     if id <= 0
       return [0, relid, new_relation.id, new_relation.version]
@@ -446,7 +456,10 @@ class AmfController < ApplicationController
   rescue OSM::APIChangesetAlreadyClosedError => ex
     return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}"]
   rescue OSM::APIVersionMismatchError => ex
-    return [-1, "You have taken too long to edit, please reload the area"]
+    # 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, "You have taken too long to edit, please reload the area"]
   rescue OSM::APIAlreadyDeletedError => ex
     return [-1, "The object has already been deleted"]
   rescue OSM::APIError => ex
@@ -464,7 +477,7 @@ class AmfController < ApplicationController
   # 3. hash of renumbered nodes (old id=>new id),
   # 4. version
 
-  def putway(renumberednodes, usertoken, changeset, originalway, points, attributes) #:doc:
+  def putway(renumberednodes, usertoken, changeset, version, originalway, points, attributes) #:doc:
 
     # -- Initialise and carry out checks
 	
@@ -482,94 +495,108 @@ class AmfController < ApplicationController
 
     # -- Get unique nodes
 
-    if originalway <= 0
-      uniques = []
-    else
-      way = Way.find(originalway)
-      uniques = way.unshared_node_ids
-    end
-    new_way = Way.new
-
-    # -- Compare nodes and save changes to any that have changed
+    Way.transaction do
+      if originalway <= 0
+        uniques = []
+      else
+        way = Way.find(originalway)
+        uniques = way.unshared_node_ids
+      end
+      new_way = Way.new
 
-    nodes = []
+      # -- Compare nodes and save changes to any that have changed
 
-    points.each do |n|
-      lon = n[0].to_f
-      lat = n[1].to_f
-      id = n[2].to_i
-      version = n[3].to_i # FIXME which index does the version come in on????
-      savenode = false
-      # We always need a new node if we are saving it
-      new_node = Node.new
+      nodes = []
 
+      points.each do |n|
+        lon = n[0].to_f
+        lat = n[1].to_f
+        id = n[2].to_i
+        version = n[3].to_i # FIXME which index does the version come in on????
+        savenode = false
+        # We always need a new node if we are saving it
+        new_node = Node.new
 
-      if renumberednodes[id]
-        id = renumberednodes[id]
-      end
-      if id <= 0
-        # Create new node
-        savenode = true
-      else
-        # Don't modify this node, make any changes you want to the new_node above
-        node = Node.find(id)
-        nodetags=node.tags
-        nodetags.delete('created_by')
-        if !fpcomp(lat, node.lat) or !fpcomp(lon, node.lon) or
-           n[4] != nodetags or !node.visible?
-          savenode = true
+        if renumberednodes[id]
+          id = renumberednodes[id]
         end
-      end
-
-      if savenode
-        new_node.changeset_id = changeset
-        new_node.lat = lat
-        new_node.lon = lon
-        new_node.tags = n[4]
-        new_node.visible = true
-        new_node.version = version
         if id <= 0
-          # We're creating the node
-          new_node.create_with_history(user)
+          # Create new node
+          savenode = true
         else
-          # We're updating the node (no delete here)
-          node.update_from(new_node, user)
+          # Don't modify this node, make any changes you want to the new_node above
+          node = Node.find(id)
+          nodetags=node.tags
+          nodetags.delete('created_by')
+          if !fpcomp(lat, node.lat) or !fpcomp(lon, node.lon) or
+             n[4] != nodetags or !node.visible?
+            savenode = true
+          end
         end
 
-        if id != node.id
-          renumberednodes[id] = node.id
-          id = node.id
+        if savenode
+          new_node.changeset_id = changeset
+          new_node.lat = lat
+          new_node.lon = lon
+          new_node.tags = n[4]
+          new_node.version = version
+          if id <= 0
+            # We're creating the node
+            new_node.create_with_history(user)
+          else
+            # We're updating the node (no delete here)
+            node.update_from(new_node, user)
+          end
+
+          if id != node.id
+            renumberednodes[id] = node.id
+            id = node.id
+          end
         end
-      end
 
-      uniques = uniques - [id]
-      nodes.push(id)
-    end
+        uniques = uniques - [id]
+        nodes.push(id)
+      end
 
-    # -- Delete any unique nodes
+      # -- Delete any unique nodes
 	
-    uniques.each do |n|
-      deleteitemrelations(n, 'node')
+      uniques.each do |n|
+        #deleteitemrelations(n, 'node')
 
-      node = Node.find(n)
-      new_node = Node.new
-      new_node.changeset_id = changeset
-      new_node.version = version
-      node.delete_with_history!(new_node, user)
-    end
+        node = Node.find(n)
+        new_node = Node.new
+        new_node.changeset_id = changeset
+        new_node.version = version
+        node.delete_with_history!(new_node, user)
+      end
 
-    # -- Save revised way
+      # -- Save revised way
 
-    if way.tags!=attributes or way.nds!=nodes or !way.visible?
-      new_way = Way.new
-      new_way.tags = attributes
-      new_way.nds = nodes
-      new_way.changeset_id = changeset
-      new_way.version = version
-      way.update_from(new_way, user)
-    end
+      if way.tags!=attributes or way.nds!=nodes or !way.visible?
+        new_way = Way.new
+        new_way.tags = attributes
+        new_way.nds = nodes
+        new_way.changeset_id = changeset
+        new_way.version = version
+        way.update_from(new_way, user)
+      end
+    end # transaction
 
     [0, originalway, way.id, renumberednodes, way.version]
+  rescue OSM::APIChangesetAlreadyClosedError => ex
+    return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}"]
+  rescue OSM::APIVersionMismatchError => ex
+    # 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, "You have taken too long to edit, please reload the area"]
+  rescue OSM::APITooManyWayNodesError => ex
+    return [-1, "You have tried to upload a way with #{ex.provided}, however only #{ex.max} are allowed."]
+  rescue OSM::APIAlreadyDeletedError => ex
+    return [-1, "The object has already been deleted"]
+  rescue OSM::APIError => ex
+    # Some error that we don't specifically catch
+    return [-2, "Something really bad happened :-()"]
   end
 
   # Save POI to the database.
@@ -587,40 +614,52 @@ class AmfController < ApplicationController
     id = id.to_i
     visible = (visible.to_i == 1)
 
-    if id > 0 then
-      node = Node.find(id)
+    Node.transaction do
+      if id > 0 then
+        node = Node.find(id)
 
-      if !visible then
-        unless node.ways.empty? then return -1,"The point has since become part of a way, so you cannot save it as a POI." end
-        deleteitemrelations(id, 'node')
+        if !visible then
+          unless node.ways.empty? then return -1,"The point has since become part of a way, so you cannot save it as a POI." end
+          deleteitemrelations(id, 'node')
+        end
       end
-    end
-    # We always need a new node, based on the data that has been sent to us
-    new_node = Node.new
-
-    new_node.id = id
-    new_node.changeset_id = changeset
-    new_node.version = version
-    new_node.lat = lat
-    new_node.lon = lon
-    new_node.tags = tags
-    new_node.visible = visible
-    if id <= 0 
-      # We're creating the node
-      new_node.create_with_history(user)
-    elsif visible
-      # We're updating the node
-      node.update_from(new_node, user)
-    else
-      # We're deleting the node
-      node.delete_with_history!(new_node, user)
-    end
+      # We always need a new node, based on the data that has been sent to us
+      new_node = Node.new
+
+      new_node.changeset_id = changeset
+      new_node.version = version
+      new_node.lat = lat
+      new_node.lon = lon
+      new_node.tags = tags
+      if id <= 0 
+        # We're creating the node
+        new_node.create_with_history(user)
+      elsif visible
+        # We're updating the node
+        node.update_from(new_node, user)
+      else
+        # We're deleting the node
+        node.delete_with_history!(new_node, user)
+      end
+    end # transaction
 
     if id <= 0
       return [0, id, new_node.id, new_node.version]
     else
       return [0, id, node.id, node.version]
     end
+  rescue OSM::APIChangesetAlreadyClosedError => ex
+    return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}"]
+  rescue OSM::APIVersionMismatchError => ex
+    # 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, "You have taken too long to edit, please reload the area"]
+  rescue OSM::APIAlreadyDeletedError => ex
+    return [-1, "The object has already been deleted"]
+  rescue OSM::APIError => ex
+    # Some error that we don't specifically catch
+    return [-2, "Something really bad happened :-()"]
   end
 
   # Read POI from database
@@ -643,40 +682,83 @@ class AmfController < ApplicationController
   end
 
   # Delete way and all constituent nodes. Also removes from any relations.
+  # Params:
+  # * The user token
+  # * the changeset id
+  # * the id of the way to change
+  # * the version of the way that was downloaded
+  # * a hash of the id and versions of all the nodes that are in the way, if any 
+  # of the nodes have been changed by someone else then, there is a problem!
   # Returns 0 (success), unchanged way id.
 
-  def deleteway(usertoken, changeset_id, way_id) #:doc:
-    if !getuserid(usertoken) then return -1,"You are not logged in, so the way could not be deleted." end
-
-    way_id = way_id.to_i
-
-    # FIXME: would be good not to make two history entries when removing
-    #		 two nodes from the same relation
-    way = Way.find(way_id)
-    way.unshared_node_ids.each do |n|
-      deleteitemrelations(n, 'node')
+  def deleteway(usertoken, changeset_id, way_id, way_version, node_id_version) #:doc:
+    user = getuser(usertoken)
+    unless user then return -1,"You are not logged in, so the way could not be deleted." end
+    # Need a transaction so that if one item fails to delete, the whole delete fails.
+    Way.transaction do
+      way_id = way_id.to_i
+
+      # FIXME: would be good not to make two history entries when removing
+      #		 two nodes from the same relation
+      old_way = Way.find(way_id)
+      #old_way.unshared_node_ids.each do |n|
+      #  deleteitemrelations(n, 'node')
+      #end
+      #deleteitemrelations(way_id, 'way')
+
+   
+      #way.delete_with_relations_and_nodes_and_history(changeset_id.to_i)
+      old_way.unshared_node_ids.each do |node_id|
+        # delete the node
+        node = Node.find(node_id)
+        delete_node = Node.new
+        delete_node.version = node_id_version[node_id]
+        node.delete_with_history!(delete_node, user)
+      end
+      # delete the way
+      delete_way = Way.new
+      delete_way.version = way_version
+      old_way.delete_with_history!(delete_way, user)
     end
-    deleteitemrelations(way_id, 'way')
-
-    way.delete_with_relations_and_nodes_and_history(changeset_id.to_i)
-
     [0, way_id]
+  rescue OSM::APIChangesetAlreadyClosedError => ex
+    return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}"]
+  rescue OSM::APIVersionMismatchError => ex
+    # 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, "You have taken too long to edit, please reload the area"]
+  rescue OSM::APIAlreadyDeletedError => ex
+    return [-1, "The object has already been deleted"]
+  rescue OSM::APIError => ex
+    # Some error that we don't specifically catch
+    return [-2, "Something really bad happened :-()"]
   end
 
 
   # ====================================================================
   # Support functions
 
+  # delete a way and its nodes that aren't part of other ways
+  # this functionality used to be in the model, however it is specific to amf
+  # controller
+  #def delete_unshared_nodes(changeset_id, way_id)
+  
   # Remove a node or way from all relations
-
-  def deleteitemrelations(objid, type) #:doc:
+  # FIXME needs version, changeset, and user
+  def deleteitemrelations(objid, type, version) #:doc:
     relations = RelationMember.find(:all, 
 									:conditions => ['member_type = ? and member_id = ?', type, objid], 
 									:include => :relation).collect { |rm| rm.relation }.uniq
 
     relations.each do |rel|
       rel.members.delete_if { |x| x[0] == type and x[1] == objid }
-      rel.save_with_history!
+      # FIXME need to create the new relation
+      new_rel = Relation.new
+      new_rel.version = version
+      new_rel.members = members
+      new_rel.changeset = changeset
+      rel.delete_with_history(new_rel, user)
     end
   end