X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e341ef56736616e134ddbe29e2f2fd60224c0432..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index e81f798b9..7d2219d75 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -4,6 +4,7 @@ class Node < ActiveRecord::Base include GeoRecord include ConsistencyValidations include NotRedactable + include ObjectMetadata self.table_name = "current_nodes" @@ -15,17 +16,17 @@ class Node < ActiveRecord::Base has_many :ways, :through => :way_nodes has_many :node_tags - + has_many :old_way_nodes - has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way + has_many :ways_via_history, :class_name => "Way", :through => :old_way_nodes, :source => :way has_many :containing_relation_members, :class_name => "RelationMember", :as => :member - has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder + has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation validates_presence_of :id, :on => :update - validates_presence_of :timestamp,:version, :changeset_id + validates_presence_of :timestamp, :version, :changeset_id validates_uniqueness_of :id - validates_inclusion_of :visible, :in => [ true, false ] + validates_inclusion_of :visible, :in => [true, false] validates_numericality_of :latitude, :longitude, :changeset_id, :version, :integer_only => true validates_numericality_of :id, :on => :update, :integer_only => true validate :validate_position @@ -40,42 +41,40 @@ class Node < ActiveRecord::Base end # Read in xml as text and return it's Node object representation - def self.from_xml(xml, create=false) - begin - p = XML::Parser.string(xml) - doc = p.parse + def self.from_xml(xml, create = false) + p = XML::Parser.string(xml) + doc = p.parse - 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) + doc.find('//osm/node').each do |pt| + return Node.from_xml_node(pt, create) end + fail 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 - def self.from_xml_node(pt, create=false) + def self.from_xml_node(pt, create = false) node = Node.new - - raise OSM::APIBadXMLError.new("node", pt, "lat missing") if pt['lat'].nil? - raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt['lon'].nil? + + fail OSM::APIBadXMLError.new("node", pt, "lat missing") if pt['lat'].nil? + fail OSM::APIBadXMLError.new("node", pt, "lon missing") if pt['lon'].nil? node.lat = OSM.parse_float(pt['lat'], OSM::APIBadXMLError, "node", pt, "lat not a number") node.lon = OSM.parse_float(pt['lon'], OSM::APIBadXMLError, "node", pt, "lon not a number") - raise OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt['changeset'].nil? + fail 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? + fail OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world? # version must be present unless creating - raise OSM::APIBadXMLError.new("node", pt, "Version is required when updating") unless create or not pt['version'].nil? + fail OSM::APIBadXMLError.new("node", pt, "Version is required when updating") unless create || !pt['version'].nil? node.version = create ? 0 : pt['version'].to_i unless create - raise OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt['id'].nil? + fail 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. + # .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 + fail OSM::APIBadUserInput.new("ID of node cannot be zero when updating.") if node.id == 0 end # We don't care about the time, as it is explicitly set on create/update/delete @@ -84,16 +83,16 @@ class Node < ActiveRecord::Base node.visible = true # Start with no tags - node.tags = Hash.new + node.tags = {} # Add in any tags from the XML 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']) + fail OSM::APIBadXMLError.new("node", pt, "tag is missing key") if tag['k'].nil? + fail OSM::APIBadXMLError.new("node", pt, "tag is missing value") if tag['v'].nil? + node.add_tag_key_val(tag['k'], tag['v']) end - return node + node end ## @@ -105,29 +104,29 @@ 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("node", new_node.id) + unless visible + fail OSM::APIAlreadyDeletedError.new("node", new_node.id) end - # need to start the transaction here, so that the database can + # 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) ways = Way.joins(:way_nodes).where(:visible => true, :current_way_nodes => { :node_id => id }).order(:id) - raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by ways #{ways.collect { |w| w.id }.join(",")}.") unless ways.empty? - + fail OSM::APIPreconditionFailedError.new("Node #{id} is still used by ways #{ways.collect(&:id).join(",")}.") unless ways.empty? + rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Node", :member_id => id }).order(:id) - raise OSM::APIPreconditionFailedError.new("Node #{self.id} is still used by relations #{rels.collect { |r| r.id }.join(",")}.") unless rels.empty? + fail OSM::APIPreconditionFailedError.new("Node #{id} is still used by relations #{rels.collect(&:id).join(",")}.") unless rels.empty? self.changeset_id = new_node.changeset_id self.tags = {} self.visible = false - + # update the changeset with the deleted position changeset.update_bbox!(bbox) - + save_with_history! end end @@ -136,27 +135,27 @@ class Node < ActiveRecord::Base 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); - + changeset.update_bbox!(bbox) + # FIXME logic needs to be double checked - self.latitude = new_node.latitude + 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); - + changeset.update_bbox!(bbox) + save_with_history! end end - + def create_with_history(user) check_create_consistency(self, user) self.version = 0 @@ -170,78 +169,42 @@ class Node < ActiveRecord::Base def to_xml doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node() - return doc + doc.root << to_xml_node + doc end def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) - el1 = XML::Node.new 'node' - el1['id'] = self.id.to_s - el1['version'] = self.version.to_s - el1['changeset'] = self.changeset_id.to_s + el = XML::Node.new 'node' + el['id'] = id.to_s - if self.visible? - el1['lat'] = self.lat.to_s - el1['lon'] = self.lon.to_s - end - - 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[user_id] = self.changeset.user.display_name - else - user_display_name_cache[user_id] = nil - end + add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) - if not user_display_name_cache[user_id].nil? - el1['user'] = user_display_name_cache[user_id] - el1['uid'] = user_id.to_s + if self.visible? + el['lat'] = lat.to_s + el['lon'] = lon.to_s end - self.tags.each do |k,v| - el2 = XML::Node.new('tag') - el2['k'] = k.to_s - el2['v'] = v.to_s - el1 << el2 - end + add_tags_to_xml_node(el, node_tags) - el1['visible'] = self.visible.to_s - el1['timestamp'] = self.timestamp.xmlschema - return el1 + el end def tags_as_hash - return tags + tags end def tags - unless @tags - @tags = {} - self.node_tags.each do |tag| - @tags[tag.k] = tag.v - end - end - @tags + @tags ||= Hash[node_tags.collect { |t| [t.k, t.v] }] end - def tags=(t) - @tags = t - end + attr_writer :tags - def add_tag_key_val(k,v) - @tags = Hash.new unless @tags + def add_tag_key_val(k, v) + @tags = {} unless @tags # duplicate tags are now forbidden, so we can't allow values # in the hash to be overwritten. - raise OSM::APIDuplicateTagsError.new("node", self.id, k) if @tags.include? k + fail OSM::APIDuplicateTagsError.new("node", id, k) if @tags.include? k @tags[k] = v end @@ -256,10 +219,10 @@ class Node < ActiveRecord::Base ## # dummy method to make the interfaces of node, way and relation # more consistent. - def fix_placeholders!(id_map, placeholder_id = nil) + 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! @@ -271,14 +234,14 @@ class Node < ActiveRecord::Base # Create a NodeTag tags = self.tags - NodeTag.delete_all(:node_id => self.id) - tags.each do |k,v| + NodeTag.delete_all(:node_id => id) + tags.each do |k, v| tag = NodeTag.new - tag.node_id = self.id - tag.k = k - tag.v = v + tag.node_id = id + tag.k = k + tag.v = v tag.save! - end + end # Create an OldNode old_node = OldNode.from_node(self) @@ -292,5 +255,4 @@ class Node < ActiveRecord::Base changeset.save! end end - end