X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5cbd4038edb32b0304bd766e70fc680ea447b52b..c7061991e74a20cc0576a3afa269821a87178f77:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index 19210b8ac..20c874931 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -1,5 +1,5 @@ class Node < ActiveRecord::Base - require 'xml/libxml' + require "xml/libxml" include GeoRecord include ConsistencyValidations @@ -23,14 +23,21 @@ class Node < ActiveRecord::Base has_many :containing_relation_members, :class_name => "RelationMember", :as => :member 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_uniqueness_of :id - 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 + validates :id, :uniqueness => true, :presence => { :on => :update }, + :numericality => { :on => :update, :integer_only => true } + validates :version, :presence => true, + :numericality => { :integer_only => true } + validates :changeset_id, :presence => true, + :numericality => { :integer_only => true } + validates :latitude, :presence => true, + :numericality => { :integer_only => true } + validates :longitude, :presence => true, + :numericality => { :integer_only => true } + validates :timestamp, :presence => true + validates :changeset, :associated => true + validates :visible, :inclusion => [true, false] + validate :validate_position - validates_associated :changeset scope :visible, -> { where(:visible => true) } scope :invisible, -> { where(:visible => false) } @@ -45,7 +52,7 @@ class Node < ActiveRecord::Base p = XML::Parser.string(xml) doc = p.parse - doc.find('//osm/node').each do |pt| + 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.") @@ -56,22 +63,22 @@ class Node < ActiveRecord::Base def self.from_xml_node(pt, create = false) node = Node.new - 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") - fail OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt['changeset'].nil? - node.changeset_id = pt['changeset'].to_i + 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") + fail OSM::APIBadXMLError.new("node", pt, "Changeset id is missing") if pt["changeset"].nil? + node.changeset_id = pt["changeset"].to_i fail OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world? # version must be present unless creating - fail OSM::APIBadXMLError.new("node", pt, "Version is required when updating") unless create || !pt['version'].nil? - node.version = create ? 0 : pt['version'].to_i + 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 - fail OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt['id'].nil? - node.id = pt['id'].to_i + 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. # We want to make sure that there is no id with zero anyway fail OSM::APIBadUserInput.new("ID of node cannot be zero when updating.") if node.id == 0 @@ -86,10 +93,10 @@ class Node < ActiveRecord::Base node.tags = {} # Add in any tags from the XML - pt.find('tag').each do |tag| - 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']) + pt.find("tag").each do |tag| + 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 node @@ -110,7 +117,7 @@ class Node < ActiveRecord::Base # provide repeatable reads for the used-by checks. this means it # shouldn't be possible to get race conditions. Node.transaction do - self.lock! + lock! check_consistency(self, new_node, user) ways = Way.joins(:way_nodes).where(:visible => true, :current_way_nodes => { :node_id => id }).order(:id) fail OSM::APIPreconditionFailedError.new("Node #{id} is still used by ways #{ways.collect(&:id).join(",")}.") unless ways.empty? @@ -131,7 +138,7 @@ class Node < ActiveRecord::Base def update_from(new_node, user) Node.transaction do - self.lock! + lock! check_consistency(self, new_node, user) # update changeset first @@ -141,7 +148,7 @@ class Node < ActiveRecord::Base # update changeset bbox with *old* position first changeset.update_bbox!(bbox) - # FIXME logic needs to be double checked + # FIXME: logic needs to be double checked self.latitude = new_node.latitude self.longitude = new_node.longitude self.tags = new_node.tags @@ -172,14 +179,14 @@ class Node < ActiveRecord::Base end def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) - el = XML::Node.new 'node' - el['id'] = id.to_s + el = XML::Node.new "node" + el["id"] = id.to_s add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) - if self.visible? - el['lat'] = lat.to_s - el['lon'] = lon.to_s + if visible? + el["lat"] = lat.to_s + el["lon"] = lon.to_s end add_tags_to_xml_node(el, node_tags) @@ -228,7 +235,7 @@ class Node < ActiveRecord::Base Node.transaction do self.version += 1 self.timestamp = t - self.save! + save! # Create a NodeTag tags = self.tags