doc.find('//osm/node').each do |pt|
return Node.from_xml_node(pt, create)
end
+ raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.")
rescue LibXML::XML::Error, ArgumentError => ex
raise OSM::APIBadXMLError.new("node", xml, ex.message)
end
raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt['lon'].nil?
node.lat = pt['lat'].to_f
node.lon = pt['lon'].to_f
- raise OSM::APIBadXMLError.new("node", pt, "changeset id missing") if pt['changeset'].nil?
+ raise OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt['changeset'].nil?
node.changeset_id = pt['changeset'].to_i
raise OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world?
node.version = create ? 0 : pt['version'].to_i
unless create
- if pt['id'] != '0'
- node.id = pt['id'].to_i
- end
+ raise OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt['id'].nil?
+ node.id = pt['id'].to_i
+ # .to_i will return 0 if there is no number that can be parsed.
+ # We want to make sure that there is no id with zero anyway
+ raise OSM::APIBadUserInput.new("ID of node cannot be zero when updating.") if node.id == 0
end
- # visible if it says it is, or as the default if the attribute
- # is missing.
- # Don't need to set the visibility, when it is set explicitly in the create/update/delete
- #node.visible = pt['visible'].nil? or pt['visible'] == 'true'
-
# We don't care about the time, as it is explicitly set on create/update/delete
-
- tags = []
+ # We don't care about the visibility as it is implicit based on the action
+ # and set manually before the actual delete
+ node.visible = true
pt.find('tag').each do |tag|
+ raise OSM::APIBadXMLError.new("node", pt, "tag is missing key") if tag['k'].nil?
+ raise OSM::APIBadXMLError.new("node", pt, "tag is missing value") if tag['v'].nil?
node.add_tag_key_val(tag['k'],tag['v'])
end
# provide repeatable reads for the used-by checks. this means it
# shouldn't be possible to get race conditions.
Node.transaction do
+ self.lock!
check_consistency(self, new_node, user)
- way = WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id",
+ way = WayNode.find(:first, :joins => :way,
:conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ])
- raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by way #{way.id}.") unless way.nil?
+ raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by way #{way.way.id}.") unless way.nil?
- rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
+ rel = RelationMember.find(:first, :joins => :relation,
:conditions => [ "visible = ? AND member_type='Node' and member_id=? ", true, self.id])
raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by relation #{rel.relation.id}.") unless rel.nil?
end
end
- # As above but doesn't throw an error if node is used elsewhere - instead, just silently
- # returns without deleting the node. Potlatch needs this in case you ask to delete an
- # off-screen node while deleting a way - it doesn't know whether the node is used
- # elsewhere or not.
- def delete_with_history_unless_used!(new_node, user)
- unless self.visible
- raise OSM::APIAlreadyDeletedError.new("node", new_node.id)
- end
-
+ def update_from(new_node, user)
Node.transaction do
+ self.lock!
check_consistency(self, new_node, user)
- way = WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id",
- :conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ])
- rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
- :conditions => [ "visible = ? AND member_type='Node' and member_id=? ", true, self.id])
- if way.nil? and rel.nil?
- self.changeset_id = new_node.changeset_id
- self.visible = false
- changeset.update_bbox!(bbox)
- save_with_history!
- end
+
+ # update changeset first
+ self.changeset_id = new_node.changeset_id
+ self.changeset = new_node.changeset
+
+ # update changeset bbox with *old* position first
+ changeset.update_bbox!(bbox);
+
+ # FIXME logic needs to be double checked
+ self.latitude = new_node.latitude
+ self.longitude = new_node.longitude
+ self.tags = new_node.tags
+ self.visible = true
+
+ # update changeset bbox with *new* position
+ changeset.update_bbox!(bbox);
+
+ save_with_history!
end
end
-
- def update_from(new_node, user)
- check_consistency(self, new_node, user)
-
- # update changeset first
- self.changeset_id = new_node.changeset_id
- self.changeset = new_node.changeset
-
- # update changeset bbox with *old* position first
- changeset.update_bbox!(bbox);
-
- # FIXME logic needs to be double checked
- self.latitude = new_node.latitude
- self.longitude = new_node.longitude
- self.tags = new_node.tags
- self.visible = true
-
- # update changeset bbox with *new* position
- changeset.update_bbox!(bbox);
-
- save_with_history!
- end
def create_with_history(user)
check_create_consistency(self, user)
projects / rails.git / blobdiff