X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e9527b363da441337ac8c44c9d3d3feada3eaa9c..b7335940e21bfe4fc9ac688130687398e677cfae:/app/controllers/amf_controller.rb diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index e9bcb281b..39de7e671 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -446,7 +446,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 @@ -468,7 +471,7 @@ class AmfController < ApplicationController # -- Initialise and carry out checks - user = getuserid(usertoken) + user = getuser(usertoken) if !user then return -1,"You are not logged in, so the way could not be saved." end originalway = originalway.to_i @@ -506,7 +509,8 @@ class AmfController < ApplicationController if renumberednodes[id] id = renumberednodes[id] - elsif id <= 0 + end + if id <= 0 # Create new node savenode = true else @@ -569,11 +573,23 @@ class AmfController < ApplicationController end [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::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. # Refuses save if the node has since become part of a way. - # Returns: + # Returns array with: # 0. 0 (success), # 1. original node id (unchanged), # 2. new node id, @@ -597,6 +613,7 @@ class AmfController < ApplicationController # 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 @@ -619,6 +636,18 @@ class AmfController < ApplicationController 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,21 +672,23 @@ class AmfController < ApplicationController # Delete way and all constituent nodes. Also removes from any relations. # 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 + def deleteway(usertoken, changeset_id, way_id, version_id) #:doc: + user = getuser(usertoken) + if 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') - # 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') + way.delete_with_relations_and_nodes_and_history(changeset_id.to_i) end - deleteitemrelations(way_id, 'way') - - way.delete_with_relations_and_nodes_and_history(changeset_id.to_i) - [0, way_id] end @@ -666,7 +697,7 @@ class AmfController < ApplicationController # Support functions # Remove a node or way from all relations - + # FIXME needs version, changeset, and user def deleteitemrelations(objid, type) #:doc: relations = RelationMember.find(:all, :conditions => ['member_type = ? and member_id = ?', type, objid], @@ -674,7 +705,12 @@ class AmfController < ApplicationController 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 node/way based on the type. + 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