Update to iD v2.26.2

[rails.git] / app / models / node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 2e71813ff948e853a429df6764b4ca375f220ce0..ad4318487b722839771e0a94b9cfc62561a966bd 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -21,19 +21,18 @@
 #  current_nodes_changeset_id_fkey  (changeset_id => changesets.id)
 #
 
 #  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
   require "xml/libxml"
 
   include GeoRecord
   include ConsistencyValidations
   include NotRedactable

-  include ObjectMetadata

 
   self.table_name = "current_nodes"
 
   belongs_to :changeset
 
 
   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
 
   has_many :way_nodes
   has_many :ways, :through => :way_nodes


@@ -50,8 +49,6 @@ class Node < ActiveRecord::Base
                  :numericality => { :on => :update, :only_integer => true }
   validates :version, :presence => true,
                       :numericality => { :only_integer => true }
                  :numericality => { :on => :update, :only_integer => true }
   validates :version, :presence => true,
                       :numericality => { :only_integer => true }

-  validates :changeset_id, :presence => true,
-                           :numericality => { :only_integer => true }

   validates :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,
   validates :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,


@@ -71,19 +68,21 @@ class Node < ActiveRecord::Base
   end
 
   # Read in xml as text and return it's Node object representation
   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
     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
     end

-    raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.")

   rescue LibXML::XML::Error, ArgumentError => e
     raise OSM::APIBadXMLError.new("node", xml, e.message)
   end
 
   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?
     node = Node.new
 
     raise OSM::APIBadXMLError.new("node", pt, "lat missing") if pt["lat"].nil?


@@ -205,7 +204,7 @@ class Node < ActiveRecord::Base
   end
 
   def 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
   end
 
   attr_writer :tags


@@ -237,7 +236,7 @@ class Node < ActiveRecord::Base
   private
 
   def save_with_history!
   private
 
   def save_with_history!

-    t = Time.now.getutc
+    t = Time.now.utc

 
     self.version += 1
     self.timestamp = t
 
     self.version += 1
     self.timestamp = t