X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d3dc9733760e0ca127abee57cfe1d017429e423e..b90e70bd914823701fa1db8dcab52833c230c42b:/app/controllers/amf_controller.rb diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 4103ceda0..b0b3f13cf 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -27,7 +27,10 @@ # return(-1,"message") <-- just puts up a dialogue # return(-2,"message") <-- also asks the user to e-mail me # -# To write to the Rails log, use RAILS_DEFAULT_LOGGER.info("message"). +# To write to the Rails log, use logger.info("message"). + +# Remaining issues: +# * version conflict when POIs and ways are reverted class AmfController < ApplicationController require 'stringio' @@ -38,7 +41,7 @@ class AmfController < ApplicationController 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. @@ -52,7 +55,7 @@ class AmfController < ApplicationController # 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) # | @@ -67,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()) @@ -75,7 +78,7 @@ class AmfController < ApplicationController when 'whichways_deleted'; results[index]=AMF.putdata(index,whichways_deleted(*args)) when 'getway'; results[index]=AMF.putdata(index,getway(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].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 'getnode_history'; results[index]=AMF.putdata(index,getnode_history(args[0].to_i)) when 'findgpx'; results[index]=AMF.putdata(index,findgpx(*args)) @@ -109,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] @@ -122,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 @@ -152,7 +157,7 @@ class AmfController < ApplicationController cs.tags = cstags 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.created_at = Time.now.getutc cs.closed_at = cs.created_at + Changeset::IDLE_TIMEOUT cs.save_with_tags! return [0,cs.id] @@ -180,8 +185,9 @@ class AmfController < ApplicationController # 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 + enlarge = [(xmax-xmin)/8,0.01].min + xmin -= enlarge; ymin -= enlarge + xmax += enlarge; ymax += enlarge # check boundary is sane and area within defined # see /config/application.yml @@ -202,7 +208,7 @@ class AmfController < ApplicationController # 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, n.version] } + points = nodes_not_used_in_area.collect { |n| [n.id, n.lon, n.lat, n.tags, n.version] }.uniq # find the relations used by those nodes and ways relations = Relation.find_for_nodes(nodes_in_area.collect { |n| n.id }, :conditions => {:visible => true}) + @@ -210,7 +216,7 @@ class AmfController < ApplicationController relations = relations.collect { |relation| [relation.id,relation.version] }.uniq end - [0,ways, points, relations] + [0, ways, points, relations] rescue Exception => err [-2,"Sorry - I can't get the map for that area."] @@ -220,8 +226,9 @@ class AmfController < ApplicationController # with a deleted node only - not POIs or relations). def whichways_deleted(xmin, ymin, xmax, ymax) #:doc: - xmin -= 0.01; ymin -= 0.01 - xmax += 0.01; ymax += 0.01 + enlarge = [(xmax-xmin)/8,0.01].min + xmin -= enlarge; ymin -= enlarge + xmax += enlarge; ymax += enlarge # check boundary is sane and area within defined # see /config/application.yml @@ -242,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 @@ -269,7 +276,7 @@ class AmfController < ApplicationController [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, @@ -284,92 +291,101 @@ 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 + def getway_old(id, timestamp) #:doc: + if timestamp == '' + # undelete old_way = OldWay.find(:first, :conditions => ['visible = ? AND id = ?', true, id], :order => 'version DESC') points = old_way.get_nodes_undelete unless old_way.nil? else - old_way = OldWay.find(:first, :conditions => ['id = ? AND version = ?', id, version]) - points = old_way.get_nodes_revert unless old_way.nil? + begin + # revert + timestamp = DateTime.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S") + old_way = OldWay.find(:first, :conditions => ['id = ? AND timestamp <= ?', id, timestamp], :order => 'timestamp DESC') + unless old_way.nil? + points = old_way.get_nodes_revert(timestamp) + if !old_way.visible + return [-1, "Sorry, the way was deleted at that time - please revert to a previous version."] + end + end + rescue ArgumentError + # thrown by date parsing method. leave old_way as nil for + # the superb error handler below. + end end if old_way.nil? + # *** FIXME: shouldn't this be returning an error? return [-1, id, [], {}, -1,0] 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 - # Find history of a way. Returns 'way', id, and - # an array of previous versions. + # Find history of a way. + # Returns 'way', id, and an array of previous versions: + # - formerly [old_way.version, old_way.timestamp.strftime("%d %b %Y, %H:%M"), old_way.visible ? 1 : 0, user, uid] + # - now [timestamp,user,uid] # - # *** 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; + # 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. + # start date of the way. def getway_history(wayid) #:doc: - # 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) + begin + # Find list of revision dates for way and all constituent nodes + revdates=[] + revusers={} + Way.find(wayid).old_ways.collect do |a| + revdates.push(a.timestamp) + unless revusers.has_key?(a.timestamp.to_i) then revusers[a.timestamp.to_i]=change_user(a) end + a.nds.each do |n| + Node.find(n).old_nodes.collect do |o| + revdates.push(o.timestamp) + unless revusers.has_key?(o.timestamp.to_i) then revusers[o.timestamp.to_i]=change_user(o) end + end end end + waycreated=revdates[0] + revdates.uniq! + revdates.sort! + revdates.reverse! + + # Remove any dates (from nodes) before first revision date of way + revdates.delete_if { |d| d 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 @@ -527,7 +543,7 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") # 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 @@ -563,7 +579,7 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") 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] @@ -582,17 +598,6 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") end end - # -- Delete any unique nodes no longer used - - 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 pointlist.collect! {|a| @@ -601,7 +606,7 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") 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) @@ -609,6 +614,19 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") elsif way.tags!=attributes or way.nds!=pointlist or !way.visible? way.update_from(new_way, user) end + + # -- Delete any unique nodes no longer used + + 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_id + new_node.version = node.version + node.delete_with_history!(new_node, user) + end + end # transaction [0, originalway, way.id, renumberednodes, way.version, nodeversions] @@ -618,11 +636,11 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") # 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 :-(."] @@ -636,7 +654,7 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") # 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 @@ -650,13 +668,12 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") 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 @@ -684,9 +701,9 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") # 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 :-()"] @@ -697,11 +714,11 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") # # Returns array of id, long, lat, hash of tags, version. - def getpoi(id,version) #:doc: - if version>0 then - n = OldNode.find(id, :conditions=>['version=?',version]) - else + def getpoi(id,timestamp) #:doc: + if timestamp == '' then n = Node.find(id) + else + n = OldNode.find(id, :conditions=>['timestamp=?',DateTime.strptime(timestamp, "%d %b %Y, %H:%M:%S")]) end if n @@ -729,27 +746,28 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") # 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 + # delete the way old_way = Way.find(way_id) - #old_way.unshared_node_ids.each do |n| - # deleteitemrelations(n, 'node') - #end - #deleteitemrelations(way_id, 'way') + delete_way = Way.new + delete_way.version = way_version + delete_way.changeset_id = changeset_id + old_way.delete_with_history!(delete_way, user) - - #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] + delete_node.changeset_id = changeset_id + 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 - # 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 @@ -758,54 +776,40 @@ RAILS_DEFAULT_LOGGER.info("** range: #{revdates[-1]-revdates[0]}") # 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 # ==================================================================== # 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 - # 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,