X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e827a0460795bc076c115f941d074dca67decaa1..231bdf66cdc8239c37e1536be4fb52ce275219e3:/app/controllers/amf_controller.rb

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 69222fc53..331487a93 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -70,7 +70,7 @@ class AmfController < ApplicationController
       index=AMF.getstring(req)				#  | get index in response sequence
       bytes=AMF.getlong(req)				#  | get total size in bytes
       args=AMF.getvalue(req)				#  | get response (probably an array)
-      logger.info "Executing AMF #{message}:#{index}"
+      logger.info("Executing AMF #{message}:#{index}")
 
       case message
         when 'getpresets';			results[index]=AMF.putdata(index,getpresets())
@@ -112,6 +112,7 @@ class AmfController < ApplicationController
       bytes=AMF.getlong(req)				#  | get total size in bytes
       args=AMF.getvalue(req)				#  | get response (probably an array)
 
+      logger.info("Executing AMF #{message}:#{index}")
       case message
         when 'putway';				r=putway(renumberednodes,*args)
 									renumberednodes=r[3]
@@ -125,6 +126,7 @@ class AmfController < ApplicationController
         when 'startchangeset';		results[index]=AMF.putdata(index,startchangeset(*args))
       end
     end
+    logger.info("encoding AMF results")
     sendresponse(results)
   end
 
@@ -247,9 +249,9 @@ class AmfController < ApplicationController
 
   def getway(wayid) #:doc:
     if POTLATCH_USE_SQL then
-      points = sql_get_nodes_in_way(wayid)
-      tags = sql_get_tags_in_way(wayid)
-      version = sql_get_way_version(wayid)
+        points = sql_get_nodes_in_way(wayid)
+        tags = sql_get_tags_in_way(wayid)
+        version = sql_get_way_version(wayid)
       else
         # Ideally we would do ":include => :nodes" here but if we do that
         # then rails only seems to return the first copy of a node when a
@@ -311,7 +313,7 @@ class AmfController < ApplicationController
     else
       curway=Way.find(id)
       old_way.tags['history'] = "Retrieved from v#{old_way.version}"
-      return [0, id, points, old_way.tags, old_way.version, (curway.version==old_way.version and curway.visible)]
+      return [0, id, points, old_way.tags, curway.version, (curway.version==old_way.version and curway.visible)]
     end
   end
   
@@ -444,7 +446,7 @@ class AmfController < ApplicationController
   # 1. original relation id (unchanged),
   # 2. new relation id.
 
-  def putrelation(renumberednodes, renumberedways, usertoken, changeset, version, relid, tags, members, visible) #:doc:
+  def putrelation(renumberednodes, renumberedways, usertoken, changeset_id, version, relid, tags, members, visible) #:doc:
     user = getuser(usertoken)
     if !user then return -1,"You are not logged in, so the relation could not be saved." end
 
@@ -478,7 +480,7 @@ class AmfController < ApplicationController
       new_relation.members = typedmembers
       new_relation.tags = tags
       new_relation.visible = visible
-      new_relation.changeset_id = changeset
+      new_relation.changeset_id = changeset_id
       new_relation.version = version
 
 
@@ -505,12 +507,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
-    return [-3, "You have taken too long to edit, please 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."]
   rescue OSM::APIAlreadyDeletedError => ex
-    return [-1, "The object has already been deleted"]
+    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, "Something really bad happened :-( ."]
   end
 
   # Save a way to the database, including all nodes. Any nodes in the previous
@@ -534,7 +536,7 @@ class AmfController < ApplicationController
   # 4. way version,
   # 5. hash of node versions (node=>version)
 
-  def putway(renumberednodes, usertoken, changeset, wayversion, originalway, pointlist, attributes, nodes) #:doc:
+  def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes) #:doc:
 
     # -- Initialise
 	
@@ -570,7 +572,7 @@ class AmfController < ApplicationController
         if renumberednodes[id] then id = renumberednodes[id] end
 
         node = Node.new
-        node.changeset_id = changeset
+        node.changeset_id = changeset_id
         node.lat = lat
         node.lon = lon
         node.tags = a[4]
@@ -597,7 +599,7 @@ class AmfController < ApplicationController
       new_way = Way.new
       new_way.tags = attributes
       new_way.nds = pointlist
-      new_way.changeset_id = changeset
+      new_way.changeset_id = changeset_id
       new_way.version = wayversion
       if originalway <= 0
         new_way.create_with_history(user)
@@ -611,8 +613,9 @@ class AmfController < ApplicationController
       uniques=uniques-pointlist
       uniques.each do |n|
         node = Node.find(n)
+        deleteitemrelations(user, changeset_id, id, 'node', node.version)
         new_node = Node.new
-        new_node.changeset_id = changeset
+        new_node.changeset_id = changeset_id
         new_node.version = node.version
         node.delete_with_history!(new_node, user)
       end
@@ -626,11 +629,11 @@ 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
-    return [-3, "Sorry, someone else has changed this way since you started editing - please reload the area"]
+    return [-3, "Sorry, someone else has changed this way since you started editing. Please click the 'Edit' tab to reload the area."]
   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 object has already been deleted."]
+    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 :-(."]
@@ -644,7 +647,7 @@ class AmfController < ApplicationController
   # 2. new node id,
   # 3. version.
 
-  def putpoi(usertoken, changeset, version, id, lon, lat, tags, visible) #:doc:
+  def putpoi(usertoken, changeset_id, version, id, lon, lat, tags, visible) #:doc:
     user = getuser(usertoken)
     if !user then return -1,"You are not logged in, so the point could not be saved." end
 
@@ -658,13 +661,12 @@ class AmfController < ApplicationController
 
         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
       # 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.changeset_id = changeset_id
       new_node.version = version
       new_node.lat = lat
       new_node.lon = lon
@@ -692,9 +694,9 @@ 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
-    return [-3, "You have taken too long to edit, please 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."]
   rescue OSM::APIAlreadyDeletedError => ex
-    return [-1, "The object has already been deleted"]
+    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 :-()"]
@@ -744,20 +746,19 @@ class AmfController < ApplicationController
       delete_way.changeset_id = changeset_id
       old_way.delete_with_history!(delete_way, user)
 
-      # FIXME: would be good not to make two history entries when removing
-      #		 two nodes from the same relation
-      #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.changeset_id = changeset_id
-        delete_node.version = node_id_version[node_id.to_s]
+        if node_id_version[node_id.to_s]
+          delete_node.version = node_id_version[node_id.to_s]
+        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)
+	      delete_node.version = node.version
+	    end
         node.delete_with_history!(delete_node, user)
       end
     end # transaction
@@ -768,12 +769,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
-    return [-3, "You have taken too long to edit, please reload the area"]
+    return [-3, "Sorry, someone else has changed this way since you started editing. Please click the 'Edit' tab to reload the area."]
   rescue OSM::APIAlreadyDeletedError => ex
-    return [-1, "The object has already been deleted"]
+    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, "Something really bad happened :-( ."]
   end
 
 
@@ -781,36 +782,27 @@ class AmfController < ApplicationController
   # Support functions
 
   # Remove a node or way from all relations
-  # FIXME needs version, changeset, and user
-  # Fixme make sure this doesn't depend on anything and delete this, as potlatch 
-  # itself should remove the relations first
-  def deleteitemrelations(objid, type, version) #:doc:
+  # This is only used by putway and deleteway when deleting nodes removed 
+  # from a way (because Potlatch itself doesn't keep track of these - 
+  # possible FIXME).
+
+  def deleteitemrelations(user, changeset_id, 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 }
-      # 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)
+      new_rel.tags = rel.tags
+      new_rel.visible = rel.visible
+      new_rel.version = rel.version
+      new_rel.members = rel.members
+      new_rel.changeset_id = changeset_id
+      rel.update_from(new_rel, user)
     end
   end
 
-  # Break out node tags into a hash
-  # (should become obsolete as of API 0.6)
-
-  def tagstring_to_hash(a) #:doc:
-    tags={}
-    Tags.split(a) do |k, v|
-      tags[k]=v
-    end
-    tags
-  end
-
   # Authenticate token
   # (can also be of form user:pass)
   # When we are writing to the api, we need the actual user model,