# ** FIXME: refactor to reduce duplication of code across read/write
def amf_read
- req=StringIO.new(request.raw_post+0.chr)# Get POST data as request
- # (cf http://www.ruby-forum.com/topic/122163)
- req.read(2) # Skip version indicator and client ID
- results={} # Results of each body
+ if request.post?
+ req=StringIO.new(request.raw_post+0.chr)# Get POST data as request
+ # (cf http://www.ruby-forum.com/topic/122163)
+ req.read(2) # Skip version indicator and client ID
+ results={} # Results of each body
- # Parse request
+ # 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) # |
- req.getc # | skip boolean
- value=AMF.getvalue(req) # |
- header["name"]=value # |
- end
+ headers.times do # Read each header
+ name=AMF.getstring(req) # |
+ req.getc # | skip boolean
+ value=AMF.getvalue(req) # |
+ header["name"]=value # |
+ end
- bodies=AMF.getint(req) # Read number of bodies
- bodies.times do # Read each body
- message=AMF.getstring(req) # | get message name
- 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}")
-
- case message
- when 'getpresets'; results[index]=AMF.putdata(index,getpresets())
- when 'whichways'; results[index]=AMF.putdata(index,whichways(*args))
- when 'whichways_deleted'; results[index]=AMF.putdata(index,whichways_deleted(*args))
- when 'getway'; r=AMF.putdata(index,getway(args[0].to_i))
- results[index]=r
- 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]))
- 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))
- when 'findrelations'; results[index]=AMF.putdata(index,findrelations(*args))
- when 'getpoi'; results[index]=AMF.putdata(index,getpoi(*args))
+ bodies=AMF.getint(req) # Read number of bodies
+ bodies.times do # Read each body
+ message=AMF.getstring(req) # | get message name
+ 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}")
+
+ case message
+ when 'getpresets'; results[index]=AMF.putdata(index,getpresets())
+ when 'whichways'; results[index]=AMF.putdata(index,whichways(*args))
+ when 'whichways_deleted'; results[index]=AMF.putdata(index,whichways_deleted(*args))
+ when 'getway'; r=AMF.putdata(index,getway(args[0].to_i))
+ results[index]=r
+ 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]))
+ 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))
+ when 'findrelations'; results[index]=AMF.putdata(index,findrelations(*args))
+ when 'getpoi'; results[index]=AMF.putdata(index,getpoi(*args))
+ end
end
+ logger.info("encoding AMF results")
+ sendresponse(results)
+ else
+ render :nothing => true, :status => :method_not_allowed
end
- logger.info("encoding AMF results")
- sendresponse(results)
end
def amf_write
- req=StringIO.new(request.raw_post+0.chr)
- req.read(2)
- results={}
- renumberednodes={} # Shared across repeated putways
- renumberedways={} # Shared across repeated putways
-
- headers=AMF.getint(req) # Read number of headers
- headers.times do # Read each header
- name=AMF.getstring(req) # |
- req.getc # | skip boolean
- value=AMF.getvalue(req) # |
- header["name"]=value # |
- end
+ if request.post?
+ req=StringIO.new(request.raw_post+0.chr)
+ req.read(2)
+ results={}
+ renumberednodes={} # Shared across repeated putways
+ renumberedways={} # Shared across repeated putways
+
+ headers=AMF.getint(req) # Read number of headers
+ headers.times do # Read each header
+ name=AMF.getstring(req) # |
+ req.getc # | skip boolean
+ value=AMF.getvalue(req) # |
+ header["name"]=value # |
+ end
- bodies=AMF.getint(req) # Read number of bodies
- bodies.times do # Read each body
- message=AMF.getstring(req) # | get message name
- 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}")
- case message
- when 'putway'; r=putway(renumberednodes,*args)
- renumberednodes=r[3]
- if r[1] != r[2] then renumberedways[r[1]] = r[2] end
- results[index]=AMF.putdata(index,r)
- when 'putrelation'; results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))
- when 'deleteway'; results[index]=AMF.putdata(index,deleteway(*args))
- when 'putpoi'; r=putpoi(*args)
- if r[1] != r[2] then renumberednodes[r[1]] = r[2] end
- results[index]=AMF.putdata(index,r)
- when 'startchangeset'; results[index]=AMF.putdata(index,startchangeset(*args))
+ bodies=AMF.getint(req) # Read number of bodies
+ bodies.times do # Read each body
+ message=AMF.getstring(req) # | get message name
+ 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}")
+ case message
+ when 'putway'; r=putway(renumberednodes,*args)
+ renumberednodes=r[3]
+ if r[1] != r[2] then renumberedways[r[1]] = r[2] end
+ results[index]=AMF.putdata(index,r)
+ when 'putrelation'; results[index]=AMF.putdata(index,putrelation(renumberednodes, renumberedways, *args))
+ when 'deleteway'; results[index]=AMF.putdata(index,deleteway(*args))
+ when 'putpoi'; r=putpoi(*args)
+ if r[1] != r[2] then renumberednodes[r[1]] = r[2] end
+ results[index]=AMF.putdata(index,r)
+ when 'startchangeset'; results[index]=AMF.putdata(index,startchangeset(*args))
+ end
end
+ logger.info("encoding AMF results")
+ sendresponse(results)
+ else
+ render :nothing => true, :status => :method_not_allowed
end
- logger.info("encoding AMF results")
- sendresponse(results)
end
private
[0, ways, points, relations]
rescue Exception => err
- [-2,"Sorry - I can't get the map for that area."]
+ [-2,"Sorry - I can't get the map for that area. The server said: #{err}"]
end
# Find deleted ways in current bounding box (similar to whichways, but ways
begin
check_boundaries(xmin, ymin, xmax, ymax)
rescue Exception => err
- return [-2,"Sorry - I can't get the map for that area."]
+ return [-2,"Sorry - I can't get the map for that area. The server said: #{err}"]
end
nodes_in_area = Node.find_by_area(ymin, xmin, ymax, xmax, :conditions => ["current_ways.visible = ?", false], :include => :ways_via_history)
# then rails only seems to return the first copy of a node when a
# way includes a node more than once
begin
- way = Way.find(wayid)
+ way = Way.find(wayid, :include => { :nodes => :node_tags })
rescue ActiveRecord::RecordNotFound
return [wayid,[],{}]
end
if searchterm.to_i>0 then
rel = Relation.find(searchterm.to_i)
if rel and rel.visible then
- rels.push([rel.id, rel.tags, rel.members])
+ rels.push([rel.id, rel.tags, rel.members, rel.version])
end
else
RelationTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", searchterm] ).each do |t|
if t.relation.visible then
- rels.push([t.relation.id, t.relation.tags, t.relation.members])
+ rels.push([t.relation.id, t.relation.tags, t.relation.members, t.relation.version])
end
end
end
new_relation.version = version
if relid <= 0
- # We're creating the node
+ # We're creating the relation
new_relation.create_with_history(user)
elsif visible
- # We're updating the node
+ # We're updating the relation
relation.update_from(new_relation, user)
else
- # We're deleting the node
+ # We're deleting the relation
relation.delete_with_history!(new_relation, user)
end
end # transaction
# 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 relation since you started editing. Please click the 'Edit' tab to 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. The server said: #{ex}"]
rescue OSM::APIAlreadyDeletedError => ex
return [-1, "The relation has already been deleted."]
rescue OSM::APIError => ex
# Some error that we don't specifically catch
- return [-2, "An unusual error happened (in 'putrelation' #{relid})."]
+ return [-2, "An unusual error happened (in 'putrelation' #{relid}). The server said: #{ex}"]
end
# Save a way to the database, including all nodes. Any nodes in the previous
# 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])
+ # 7. array of nodes to change (each one is [lon,lat,id,version,tags]),
+ # 8. hash of nodes to delete (id->version).
#
# Returns:
# 0. '0' (code for success),
# 4. way version,
# 5. hash of node versions (node=>version)
- def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes) #:doc:
+ def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes, deletednodes) #:doc:
# -- Initialise
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 }
+ pointlist.collect! {|a| a.to_i }
way=nil # this is returned, so scope it outside the transaction
nodeversions = {}
Way.transaction do
- # -- Get unique nodes
-
- if originalway <= 0
- uniques = []
- else
- way = Way.find(originalway)
- uniques = way.unshared_node_ids
- end
-
- #-- Update each changed node
+ # -- Update each changed node
nodes.each do |a|
lon = a[0].to_f
# -- Save revised way
- pointlist.collect! {|a|
- renumberednodes[a] ? renumberednodes[a]:a
- } # renumber nodes
+ pointlist.collect! {|a|
+ renumberednodes[a] ? renumberednodes[a]:a
+ } # renumber nodes
new_way = Way.new
new_way.tags = attributes
new_way.nds = pointlist
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)
+ else
+ way = Way.find(originalway)
+ if way.tags!=attributes or way.nds!=pointlist or !way.visible?
+ way.update_from(new_way, user)
+ end
end
- # -- Delete any unique nodes no longer used
+ # -- Delete unwanted nodes
- uniques=uniques-pointlist
- uniques.each do |n|
- node = Node.find(n)
- deleteitemrelations(user, changeset_id, id, 'Node', node.version)
+ deletednodes.each do |id,v|
+ node = Node.find(id.to_i)
new_node = Node.new
new_node.changeset_id = changeset_id
- new_node.version = node.version
- node.delete_with_history!(new_node, user)
+ new_node.version = v.to_i
+ begin
+ node.delete_with_history!(new_node, user)
+ rescue OSM::APIPreconditionFailedError => ex
+ # We don't do anything here as the node is being used elsewhere
+ # and we don't want to delete it
+ end
end
end # transaction
- [0, originalway, way.id, renumberednodes, way.version, nodeversions]
+ [0, originalway, way.id, renumberednodes, way.version, nodeversions, deletednodes]
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 click the 'Edit' tab to reload the area."]
+ return [-3, "Sorry, someone else has changed this way since you started editing. Click the 'Edit' tab to reload the area. The server said: #{ex}"]
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 point has already been deleted."]
rescue OSM::APIError => ex
# Some error that we don't specifically catch
- return [-2, "An unusual error happened (in 'putway' #{originalway})."]
+ return [-2, "An unusual error happened (in 'putway' #{originalway}). The server said: #{ex}"]
end
# Save POI to the database.
# 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 point since you started editing. Please click the 'Edit' tab to 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. The server said: #{ex}"]
rescue OSM::APIAlreadyDeletedError => ex
return [-1, "The point has already been deleted"]
rescue OSM::APIError => ex
# Some error that we don't specifically catch
- return [-2, "An unusual error happened (in 'putpoi' #{id})."]
+ return [-2, "An unusual error happened (in 'putpoi' #{id}). The server said: #{ex}"]
end
# Read POI from database
# (only called on revert: POIs are usually read by whichways).
#
- # Returns array of id, long, lat, hash of tags, version.
+ # Returns array of id, long, lat, hash of tags, (current) version.
def getpoi(id,timestamp) #:doc:
- if timestamp == '' then
- n = Node.find(id)
- else
+ n = Node.find(id)
+ v = n.version
+ unless timestamp == ''
n = OldNode.find(id, :conditions=>['timestamp=?',DateTime.strptime(timestamp, "%d %b %Y, %H:%M:%S")])
end
if n
- return [n.id, n.lon, n.lat, n.tags, n.version]
+ return [n.id, n.lon, n.lat, n.tags, v]
else
return [nil, nil, nil, {}, nil]
end
# 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, way_version, node_id_version) #:doc:
+ def deleteway(usertoken, changeset_id, way_id, way_version, deletednodes) #: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
- # delete the way
+ # -- Delete the way
+
old_way = Way.find(way_id)
- u = old_way.unshared_node_ids
delete_way = Way.new
delete_way.version = way_version
delete_way.changeset_id = changeset_id
old_way.delete_with_history!(delete_way, user)
- u.each do |node_id|
- # delete the node
- node = Node.find(node_id)
- delete_node = Node.new
- 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)
+ # -- Delete unwanted nodes
+
+ deletednodes.each do |id,v|
+ node = Node.find(id.to_i)
+ new_node = Node.new
+ new_node.changeset_id = changeset_id
+ new_node.version = v.to_i
+ begin
+ node.delete_with_history!(new_node, user)
+ rescue OSM::APIPreconditionFailedError => ex
+ # We don't do anything with the exception as the node is in use
+ # elsewhere and we don't want to delete it
+ end
end
+
end # transaction
[0, way_id]
rescue OSM::APIChangesetAlreadyClosedError => ex
return [-1, "The way has already been deleted."]
rescue OSM::APIError => ex
# Some error that we don't specifically catch
- return [-2, "An unusual error happened (in 'deleteway' #{way_id})."]
+ return [-2, "An unusual error happened (in 'deleteway' #{way_id}). The server said: #{ex}"]
end
# ====================================================================
# Support functions
- # Remove a node or way from all relations
- # 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.classify, objid],
- :include => :relation).collect { |rm| rm.relation }.uniq
-
- relations.each do |rel|
- rel.members.delete_if { |x| x[0] == type and x[1] == objid }
- new_rel = Relation.new
- 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
-
# Authenticate token
# (can also be of form user:pass)
# When we are writing to the api, we need the actual user model,
projects / rails.git / blobdiff