Merge remote-tracking branch 'upstream/pull/3848'

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

diff --git a/app/models/way.rb b/app/models/way.rb
index b3466213c34de289b325718bcbdbed8c37a4a744..b11c225ddb1cfd0a6fb604174d4e39354eab0276 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -17,20 +17,19 @@
 #  current_ways_changeset_id_fkey  (changeset_id => changesets.id)
 #
 
 #  current_ways_changeset_id_fkey  (changeset_id => changesets.id)
 #
 

-class Way < ActiveRecord::Base
+class Way < ApplicationRecord

   require "xml/libxml"
 
   include ConsistencyValidations
   include NotRedactable
   require "xml/libxml"
 
   include ConsistencyValidations
   include NotRedactable

-  include ObjectMetadata

 
   self.table_name = "current_ways"
 
   belongs_to :changeset
 
 
   self.table_name = "current_ways"
 
   belongs_to :changeset
 

-  has_many :old_ways, -> { order(:version) }
+  has_many :old_ways, -> { order(:version) }, :inverse_of => :current_way

 
 

-  has_many :way_nodes, -> { order(:sequence_id) }
+  has_many :way_nodes, -> { order(:sequence_id) }, :inverse_of => :way

   has_many :nodes, :through => :way_nodes
 
   has_many :way_tags
   has_many :nodes, :through => :way_nodes
 
   has_many :way_tags


@@ -42,8 +41,6 @@ class Way < 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 :timestamp, :presence => true
   validates :changeset, :associated => true
   validates :visible, :inclusion => [true, false]
   validates :timestamp, :presence => true
   validates :changeset, :associated => true
   validates :visible, :inclusion => [true, false]


@@ -52,19 +49,21 @@ class Way < ActiveRecord::Base
   scope :invisible, -> { where(:visible => false) }
 
   # Read in xml as text and return it's Way object representation
   scope :invisible, -> { where(:visible => false) }
 
   # Read in xml as text and return it's Way 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/way")

 
 

-    doc.find("//osm/way").each do |pt|
-      return Way.from_xml_node(pt, create)
+    if pt
+      Way.from_xml_node(pt, :create => create)
+    else
+      raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/way element.")

     end
     end

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

   rescue LibXML::XML::Error, ArgumentError => e
     raise OSM::APIBadXMLError.new("way", xml, e.message)
   end
 
   rescue LibXML::XML::Error, ArgumentError => e
     raise OSM::APIBadXMLError.new("way", xml, e.message)
   end
 

-  def self.from_xml_node(pt, create = false)
+  def self.from_xml_node(pt, create: false)

     way = Way.new
 
     raise OSM::APIBadXMLError.new("way", pt, "Version is required when updating") unless create || !pt["version"].nil?
     way = Way.new
 
     raise OSM::APIBadXMLError.new("way", pt, "Version is required when updating") unless create || !pt["version"].nil?


@@ -106,55 +105,15 @@ class Way < ActiveRecord::Base
     way
   end
 
     way
   end
 

-  # Find a way given it's ID, and in a single SQL call also grab its nodes and tags
-  def to_xml
-    doc = OSM::API.new.get_xml_doc
-    doc.root << to_xml_node
-    doc
-  end
-
-  def to_xml_node(visible_nodes = nil, changeset_cache = {}, user_display_name_cache = {})
-    el = XML::Node.new "way"
-    el["id"] = id.to_s
-
-    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
-
-    # make sure nodes are output in sequence_id order
-    ordered_nodes = []
-    way_nodes.each do |nd|
-      if visible_nodes
-        # if there is a list of visible nodes then use that to weed out deleted nodes
-        ordered_nodes[nd.sequence_id] = nd.node_id.to_s if visible_nodes[nd.node_id]
-      else
-        # otherwise, manually go to the db to check things
-        ordered_nodes[nd.sequence_id] = nd.node_id.to_s if nd.node&.visible?
-      end
-    end
-
-    ordered_nodes.each do |nd_id|
-      next unless nd_id && nd_id != "0"
-
-      node_el = XML::Node.new "nd"
-      node_el["ref"] = nd_id
-      el << node_el
-    end
-
-    add_tags_to_xml_node(el, way_tags)
-
-    el
-  end
-

   def nds
     @nds ||= way_nodes.collect(&:node_id)
   end
 
   def tags
   def nds
     @nds ||= way_nodes.collect(&:node_id)
   end
 
   def tags

-    @tags ||= Hash[way_tags.collect { |t| [t.k, t.v] }]
+    @tags ||= way_tags.to_h { |t| [t.k, t.v] }

   end
 
   end
 

-  attr_writer :nds
-
-  attr_writer :tags
+  attr_writer :nds, :tags

 
   def add_nd_num(n)
     @nds ||= []
 
   def add_nd_num(n)
     @nds ||= []


@@ -268,7 +227,7 @@ class Way < 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