X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e9527b363da441337ac8c44c9d3d3feada3eaa9c..d3dc9733760e0ca127abee57cfe1d017429e423e:/app/controllers/amf_controller.rb diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index e9bcb281b..4103ceda0 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -130,14 +130,16 @@ class AmfController < ApplicationController # Start new changeset def startchangeset(usertoken, cstags, closeid, closecomment) - user = getuserid(usertoken) + user = getuser(usertoken) if !user then return -1,"You are not logged in, so Potlatch can't write any changes to the database." end # close previous changeset and add comment if closeid cs = Changeset.find(closeid) cs.set_closed_time_now - if closecomment.empty? + if cs.user_id!=user.id + return -2,"You cannot close that changeset because you're not the person who opened it." + elsif closecomment.empty? cs.save! else cs.tags['comment']=closecomment @@ -148,10 +150,10 @@ class AmfController < ApplicationController # open a new changeset cs = Changeset.new cs.tags = cstags - cs.user_id = uid - # Don't like the next two lines. These need to be abstracted to the model more/better + cs.user_id = user.id + # smsm1 doesn't like the next two lines and thinks they need to be abstracted to the model more/better cs.created_at = Time.now - cs.closed_at = Time.new + Changeset::IDLE_TIMEOUT + cs.closed_at = cs.created_at + Changeset::IDLE_TIMEOUT cs.save_with_tags! return [0,cs.id] end @@ -163,21 +165,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 +194,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 +211,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 @@ -249,7 +261,7 @@ class AmfController < ApplicationController points = way.nodes.collect do |node| nodetags=node.tags nodetags.delete('created_by') - [node.lon, node.lat, node.id, nodetags] + [node.lon, node.lat, node.id, nodetags, node.version] end tags = way.tags version = way.version @@ -272,7 +284,13 @@ class AmfController < ApplicationController # 3. hash of tags, # 4. version, # 5. is this the current, visible version? (boolean) - + # + # *** FIXME: + # Should work by timestamp, not version (so that we can recover versions when + # a node has been changed, but not the enclosing way) + # Use strptime (http://www.ruby-doc.org/core/classes/DateTime.html) to + # to turn string back into timestamp. + def getway_old(id, version) #:doc: if version < 0 old_way = OldWay.find(:first, :conditions => ['visible = ? AND id = ?', true, id], :order => 'version DESC') @@ -293,55 +311,82 @@ class AmfController < ApplicationController # Find history of a way. Returns 'way', id, and # an array of previous versions. + # + # *** FIXME: + # Should look for changes in constituent nodes as well, + # and return timestamps. + # Heuristic: Find all nodes that have ever been part of the way; + # get a list of their revision dates; add revision dates of the way; + # sort and collapse list (to within 2 seconds); trim all dates before the + # start dateÊof the way. def getway_history(wayid) #:doc: - begin - history = Way.find(wayid).old_ways.reverse.collect do |old_way| - user_object = old_way.changeset.user - user = user_object.data_public? ? user_object.display_name : 'anonymous' - uid = user_object.data_public? ? user_object.id : 0 - [old_way.version, old_way.timestamp.strftime("%d %b %Y, %H:%M"), old_way.visible ? 1 : 0, user, uid] + + # Find list of revision dates for way and all constituent nodes + revdates=[] + Way.find(wayid).old_ways.collect do |a| + revdates.push(a.timestamp) + a.nds.each do |n| + Node.find(n).old_nodes.collect do |o| + revdates.push(o.timestamp) + end end + end + waycreated=revdates[0] + revdates.uniq! + revdates.sort! - return ['way',wayid,history] - rescue ActiveRecord::RecordNotFound - return ['way', wayid, []] + # Remove any dates (from nodes) before first revision date of way + revdates.delete_if { |d| d0 then - gpx = Trace.find(searchterm.to_i, :conditions => ["visible=? AND (public=? OR user_id=?)",true,true,uid] ) + gpx = Trace.find(searchterm.to_i, :conditions => ["visible=? AND (public=? OR user_id=?)",true,true,user.id] ) if gpx then gpxs.push([gpx.id, gpx.name, gpx.description]) end else - Trace.find(:all, :limit => 21, :conditions => ["visible=? AND (public=? OR user_id=?) AND MATCH(name) AGAINST (?)",true,true,uid,searchterm] ).each do |gpx| + Trace.find(:all, :limit => 21, :conditions => ["visible=? AND (public=? OR user_id=?) AND MATCH(name) AGAINST (?)",true,true,user.id,searchterm] ).each do |gpx| gpxs.push([gpx.id, gpx.name, gpx.description]) end end @@ -393,50 +438,54 @@ class AmfController < ApplicationController # 2. new relation id. def putrelation(renumberednodes, renumberedways, usertoken, changeset, version, relid, tags, members, visible) #:doc: - user = getuserid(usertoken) + user = getuser(usertoken) if !user then return -1,"You are not logged in, so the relation could not be saved." end 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' + new_relation = nil + relation = nil + 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] @@ -444,9 +493,12 @@ class AmfController < ApplicationController return [0, relid, relation.id, relation.version] end rescue OSM::APIChangesetAlreadyClosedError => ex - return [-1, "The changeset #{ex.changeset.id} was closed at #{ex.changeset.closed_at}"] + 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 @@ -457,123 +509,128 @@ class AmfController < ApplicationController # Save a way to the database, including all nodes. Any nodes in the previous # version and no longer used are deleted. # + # Parameters: + # 0. hash of renumbered nodes (added by amf_controller) + # 1. current user token (for authentication) + # 2. current changeset + # 3. new way version + # 4. way ID + # 5. list of nodes in way + # 6. hash of way tags + # 7. array of nodes to change (each one is [lon,lat,id,version,tags]) + # # Returns: # 0. '0' (code for success), # 1. original way id (unchanged), # 2. new way id, # 3. hash of renumbered nodes (old id=>new id), - # 4. version + # 4. way version, + # 5. hash of node versions (node=>version) - def putway(renumberednodes, usertoken, changeset, originalway, points, attributes) #:doc: + def putway(renumberednodes, usertoken, changeset, wayversion, originalway, pointlist, attributes, nodes) #:doc: - # -- Initialise and carry out checks + # -- Initialise - user = getuserid(usertoken) + user = getuser(usertoken) if !user then return -1,"You are not logged in, so the way could not be saved." end + if pointlist.length < 2 then return -2,"Server error - way is only #{points.length} points long." end originalway = originalway.to_i + pointlist.collect! {|a| a.to_i } - points.each do |a| - if a[2] == 0 or a[2].nil? then return -2,"Server error - node with id 0 found in way #{originalway}." end - if a[1] == 90 then return -2,"Server error - node with lat -90 found in way #{originalway}." end - end - - if points.length < 2 then return -2,"Server error - way is only #{points.length} points long." end - - # -- 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 - - 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 + way=nil # this is returned, so scope it outside the transaction + nodeversions = {} + Way.transaction do + # -- Get unique nodes - if renumberednodes[id] - id = renumberednodes[id] - elsif id <= 0 - # Create new node - savenode = true + if originalway <= 0 + uniques = [] 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 - end + way = Way.find(originalway) + uniques = way.unshared_node_ids 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 + #-- Update each changed node + + nodes.each do |a| + lon = a[0].to_f + lat = a[1].to_f + id = a[2].to_i + version = a[3].to_i + if id == 0 then return -2,"Server error - node with id 0 found in way #{originalway}." end + if lat== 90 then return -2,"Server error - node with latitude -90 found in way #{originalway}." end + if renumberednodes[id] then id = renumberednodes[id] end + + node = Node.new + node.changeset_id = changeset + node.lat = lat + node.lon = lon + node.tags = a[4] + node.tags.delete('created_by') + 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 + node.create_with_history(user) renumberednodes[id] = node.id - id = node.id + nodeversions[node.id] = node.version + else + # We're updating an existing node + previous=Node.find(id) + previous.update_from(node, user) + nodeversions[previous.id] = previous.version end end - uniques = uniques - [id] - nodes.push(id) - end - - # -- Delete any unique nodes - - uniques.each do |n| - deleteitemrelations(n, 'node') + # -- Delete any unique nodes no longer used - 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 + uniques=uniques-pointlist + uniques.each do |n| + 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? + pointlist.collect! {|a| + renumberednodes[a] ? renumberednodes[a]:a + } # renumber nodes new_way = Way.new new_way.tags = attributes - new_way.nds = nodes + new_way.nds = pointlist new_way.changeset_id = changeset - new_way.version = version - way.update_from(new_way, user) - end + new_way.version = wayversion + if originalway <= 0 + new_way.create_with_history(user) + way=new_way # so we can get way.id and way.version + elsif way.tags!=attributes or way.nds!=pointlist or !way.visible? + way.update_from(new_way, user) + end + end # transaction - [0, originalway, way.id, renumberednodes, way.version] + [0, originalway, way.id, renumberednodes, way.version, nodeversions] + rescue OSM::APIChangesetAlreadyClosedError => ex + return [-2, "Sorry, your changeset #{ex.changeset.id} has been 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, "Sorry, someone else has changed this way since you started editing - please 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."] + 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, @@ -585,40 +642,54 @@ class AmfController < ApplicationController id = id.to_i visible = (visible.to_i == 1) + node = nil + new_node = nil + Node.transaction do + if id > 0 then + node = Node.find(id) - 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') + end + end + # We always need a new node, based on the data that has been sent to us + new_node = Node.new - 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') + 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 - # 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 - 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 + end # transaction if id <= 0 return [0, id, new_node.id, new_node.version] else return [0, id, node.id, node.version] - end + 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 @@ -641,40 +712,86 @@ 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 - + 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 + 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') - end - deleteitemrelations(way_id, 'way') - - way.delete_with_relations_and_nodes_and_history(changeset_id.to_i) - + # Need a transaction so that if one item fails to delete, the whole delete fails. + Way.transaction do + + # 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 # transaction [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 + # 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: 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 @@ -702,17 +819,6 @@ class AmfController < ApplicationController end return user end - - def getuserid(token) - user = getuser(token) - return user ? user.id : nil; - end - - # Compare two floating-point numbers to within 0.0000001 - - def fpcomp(a,b) #:doc: - return ((a/0.0000001).round==(b/0.0000001).round) - end # Send AMF response