X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b2a8df0bd73f1031dcf4684e084897a28b117345..566fb06709d75f12a4854748dd1f1425a4c0480b:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index c09fcbd67..1bec9a33c 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -2,14 +2,14 @@ # # Table name: current_nodes # -# id :integer not null, primary key +# id :bigint(8) not null, primary key # latitude :integer not null # longitude :integer not null -# changeset_id :integer not null +# changeset_id :bigint(8) not null # visible :boolean not null # timestamp :datetime not null -# tile :integer not null -# version :integer not null +# tile :bigint(8) not null +# version :bigint(8) not null # # Indexes # @@ -21,19 +21,18 @@ # current_nodes_changeset_id_fkey (changeset_id => changesets.id) # -class Node < ActiveRecord::Base +class Node < ApplicationRecord require "xml/libxml" include GeoRecord include ConsistencyValidations include NotRedactable - include ObjectMetadata self.table_name = "current_nodes" belongs_to :changeset - has_many :old_nodes, -> { order(:version) } + has_many :old_nodes, -> { order(:version) }, :inverse_of => :current_node has_many :way_nodes has_many :ways, :through => :way_nodes @@ -47,15 +46,13 @@ class Node < ActiveRecord::Base has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation validates :id, :uniqueness => true, :presence => { :on => :update }, - :numericality => { :on => :update, :integer_only => true } + :numericality => { :on => :update, :only_integer => true } validates :version, :presence => true, - :numericality => { :integer_only => true } - validates :changeset_id, :presence => true, - :numericality => { :integer_only => true } + :numericality => { :only_integer => true } validates :latitude, :presence => true, - :numericality => { :integer_only => true } + :numericality => { :only_integer => true } validates :longitude, :presence => true, - :numericality => { :integer_only => true } + :numericality => { :only_integer => true } validates :timestamp, :presence => true validates :changeset, :associated => true validates :visible, :inclusion => [true, false] @@ -71,36 +68,42 @@ class Node < ActiveRecord::Base end # Read in xml as text and return it's Node object representation - def self.from_xml(xml, create = false) + def self.from_xml(xml, create: false) p = XML::Parser.string(xml, :options => XML::Parser::Options::NOERROR) doc = p.parse + pt = doc.find_first("//osm/node") - doc.find("//osm/node").each do |pt| - return Node.from_xml_node(pt, create) + if pt + Node.from_xml_node(pt, :create => create) + else + raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.") 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) + rescue LibXML::XML::Error, ArgumentError => e + raise OSM::APIBadXMLError.new("node", xml, e.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? + 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? + node.changeset_id = pt["changeset"].to_i raise OSM::APIBadUserInput, "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 || !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? + 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 @@ -119,6 +122,7 @@ class Node < ActiveRecord::Base 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 @@ -141,7 +145,7 @@ class Node < ActiveRecord::Base # shouldn't be possible to get race conditions. Node.transaction do lock! - check_consistency(self, new_node, user) + check_update_element_consistency(self, new_node, user) ways = Way.joins(:way_nodes).where(:visible => true, :current_way_nodes => { :node_id => id }).order(:id) raise OSM::APIPreconditionFailedError, "Node #{id} is still used by ways #{ways.collect(&:id).join(',')}." unless ways.empty? @@ -162,7 +166,7 @@ class Node < ActiveRecord::Base def update_from(new_node, user) Node.transaction do lock! - check_consistency(self, new_node, user) + check_update_element_consistency(self, new_node, user) # update changeset first self.changeset_id = new_node.changeset_id @@ -185,7 +189,7 @@ class Node < ActiveRecord::Base end def create_with_history(user) - check_create_consistency(self, user) + check_create_element_consistency(self, user) self.version = 0 self.visible = true @@ -195,34 +199,8 @@ class Node < ActiveRecord::Base save_with_history! end - def to_xml - doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node - doc - end - - def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) - el = XML::Node.new "node" - el["id"] = id.to_s - - add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) - - if visible? - el["lat"] = lat.to_s - el["lon"] = lon.to_s - end - - add_tags_to_xml_node(el, node_tags) - - el - end - - def tags_as_hash - tags - end - def tags - @tags ||= Hash[node_tags.collect { |t| [t.k, t.v] }] + @tags ||= node_tags.to_h { |t| [t.k, t.v] } end attr_writer :tags @@ -254,7 +232,7 @@ class Node < ActiveRecord::Base private def save_with_history! - t = Time.now.getutc + t = Time.now.utc self.version += 1 self.timestamp = t