X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b7335940e21bfe4fc9ac688130687398e677cfae..a22b0c1b64a67e46bcecbce41b07fc7a53fb0632:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index f2ad3a78a..7db4aed09 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -58,20 +58,20 @@ class Node < ActiveRecord::Base find_by_area(min_lat, min_lon, max_lat, max_lon, :conditions => {:visible => true}, - :limit => APP_CONFIG['max_number_of_nodes']+1) + :limit => MAX_NUMBER_OF_NODES+1) end # Read in xml as text and return it's Node object representation def self.from_xml(xml, create=false) begin - p = XML::Parser.new - p.string = xml + p = XML::Parser.string(xml) doc = p.parse doc.find('//osm/node').each do |pt| return Node.from_xml_node(pt, create) end - rescue LibXML::XML::Error => ex + 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 end @@ -83,7 +83,7 @@ class Node < ActiveRecord::Base 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? @@ -93,21 +93,21 @@ class Node < ActiveRecord::Base 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 @@ -124,52 +124,60 @@ class Node < ActiveRecord::Base # Should probably be renamed delete_from to come in line with update def delete_with_history!(new_node, user) unless self.visible - raise OSM::APIAlreadyDeletedError.new + raise OSM::APIAlreadyDeletedError.new("node", new_node.id) end # need to start the transaction here, so that the database can # 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) - if 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 ]) - raise OSM::APIPreconditionFailedError.new - elsif 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]) - raise OSM::APIPreconditionFailedError.new - else - self.changeset_id = new_node.changeset_id - self.visible = false - - # update the changeset with the deleted position - changeset.update_bbox!(bbox) - - save_with_history! - end + 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.way.id}.") unless way.nil? + + 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? + + self.changeset_id = new_node.changeset_id + self.visible = false + + # update the changeset with the deleted position + changeset.update_bbox!(bbox) + + save_with_history! end end def update_from(new_node, user) - check_consistency(self, new_node, user) - - # update changeset with *old* position first - changeset.update_bbox!(bbox); - - # FIXME logic needs to be double checked - self.changeset_id = new_node.changeset_id - self.latitude = new_node.latitude - self.longitude = new_node.longitude - self.tags = new_node.tags - self.visible = true - - # update changeset with *new* position - changeset.update_bbox!(bbox); - - save_with_history! + Node.transaction do + self.lock! + 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 end def create_with_history(user) check_create_consistency(self, user) - self.id = nil self.version = 0 self.visible = true @@ -185,27 +193,33 @@ class Node < ActiveRecord::Base return doc end - def to_xml_node(user_display_name_cache = nil) + def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) el1 = XML::Node.new 'node' el1['id'] = self.id.to_s el1['lat'] = self.lat.to_s el1['lon'] = self.lon.to_s el1['version'] = self.version.to_s el1['changeset'] = self.changeset_id.to_s - - user_display_name_cache = {} if user_display_name_cache.nil? - if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id) + if changeset_cache.key?(self.changeset_id) + # use the cache if available + else + changeset_cache[self.changeset_id] = self.changeset.user_id + end + + user_id = changeset_cache[self.changeset_id] + + if user_display_name_cache.key?(user_id) # use the cache if available elsif self.changeset.user.data_public? - user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name + user_display_name_cache[user_id] = self.changeset.user.display_name else - user_display_name_cache[self.changeset.user_id] = nil + user_display_name_cache[user_id] = nil end - if not user_display_name_cache[self.changeset.user_id].nil? - el1['user'] = user_display_name_cache[self.changeset.user_id] - el1['uid'] = self.changeset.user_id.to_s + if not user_display_name_cache[user_id].nil? + el1['user'] = user_display_name_cache[user_id] + el1['uid'] = user_id.to_s end self.tags.each do |k,v| @@ -258,14 +272,14 @@ class Node < ActiveRecord::Base ## # dummy method to make the interfaces of node, way and relation # more consistent. - def fix_placeholders!(id_map) + def fix_placeholders!(id_map, placeholder_id = nil) # nodes don't refer to anything, so there is nothing to do here end private def save_with_history! - t = Time.now + t = Time.now.getutc Node.transaction do self.version += 1 self.timestamp = t