# return is of the form:
# [error_code,
# [[way_id, way_version], ...],
- # [[node_id, lat, lon, [tags, ...]], ...],
+ # [[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
# 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}) +
# 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::APITooManyWayNodesError => ex
+ return [-1, "You have tried to upload a way with #{ex.provided}, however only #{ex.max} are allowed."]
rescue OSM::APIAlreadyDeletedError => ex
return [-1, "The object has already been deleted"]
rescue OSM::APIError => ex
# 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
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)
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
+ # 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"]
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, version_id) #:doc:
+ def deleteway(usertoken, changeset_id, way_id, way_version, node_id_version) #:doc:
user = getuser(usertoken)
- if user then return -1,"You are not logged in, so the way could not be deleted." end
+ 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
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')
+ #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
- deleteitemrelations(way_id, 'way')
-
- way.delete_with_relations_and_nodes_and_history(changeset_id.to_i)
+ # delete the way
+ delete_way = Way.new
+ delete_way.version = way_version
+ old_way.delete_with_history!(delete_way, user)
end
[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
# FIXME needs version, changeset, and user
- def deleteitemrelations(objid, type) #:doc:
+ 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 }
- # FIXME need to create the new node/way based on the type.
+ # FIXME need to create the new relation
new_rel = Relation.new
new_rel.version = version
new_rel.members = members
projects / rails.git / blobdiff