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

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

diff --git a/app/models/way.rb b/app/models/way.rb
index d6f0011d9c7d61b4ba0609a736b759e1e3dc6197..0150a2ee398d5dc793c335906fa5d1e0371176c8 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -2,11 +2,11 @@
 #
 # Table name: current_ways
 #
 #
 # Table name: current_ways
 #

-#  id           :integer          not null, primary key
-#  changeset_id :integer          not null
+#  id           :bigint(8)        not null, primary key
+#  changeset_id :bigint(8)        not null

 #  timestamp    :datetime         not null
 #  visible      :boolean          not null
 #  timestamp    :datetime         not null
 #  visible      :boolean          not null

-#  version      :integer          not null
+#  version      :bigint(8)        not null

 #
 # Indexes
 #
 #
 # Indexes
 #


@@ -17,7 +17,7 @@
 #  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
   require "xml/libxml"
 
   include ConsistencyValidations


@@ -39,11 +39,11 @@ class Way < ActiveRecord::Base
   has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation
 
   validates :id, :uniqueness => true, :presence => { :on => :update },
   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,
   validates :version, :presence => true,

-                      :numericality => { :integer_only => true }
+                      :numericality => { :only_integer => true }

   validates :changeset_id, :presence => true,
   validates :changeset_id, :presence => true,

-                           :numericality => { :integer_only => 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 +52,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 => ex
-    raise OSM::APIBadXMLError.new("way", xml, ex.message)
+  rescue LibXML::XML::Error, ArgumentError => e
+    raise OSM::APIBadXMLError.new("way", xml, e.message)

   end
 
   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,44 +108,6 @@ 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 && 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 nds
     @nds ||= way_nodes.collect(&:node_id)
   end


@@ -152,9 +116,7 @@ class Way < ActiveRecord::Base
     @tags ||= Hash[way_tags.collect { |t| [t.k, t.v] }]
   end
 
     @tags ||= Hash[way_tags.collect { |t| [t.k, t.v] }]
   end
 

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

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


@@ -206,7 +168,7 @@ class Way < ActiveRecord::Base
 
   def preconditions_ok?(old_nodes = [])
     return false if nds.empty?
 
   def preconditions_ok?(old_nodes = [])
     return false if nds.empty?

-    raise OSM::APITooManyWayNodesError.new(id, nds.length, MAX_NUMBER_OF_WAY_NODES) if nds.length > MAX_NUMBER_OF_WAY_NODES
+    raise OSM::APITooManyWayNodesError.new(id, nds.length, Settings.max_number_of_way_nodes) if nds.length > Settings.max_number_of_way_nodes

 
     # check only the new nodes, for efficiency - old nodes having been checked last time and can't
     # be deleted when they're in-use.
 
     # check only the new nodes, for efficiency - old nodes having been checked last time and can't
     # be deleted when they're in-use.


@@ -254,7 +216,7 @@ class Way < ActiveRecord::Base
   # to IDs +id_map+.
   def fix_placeholders!(id_map, placeholder_id = nil)
     nds.map! do |node_id|
   # to IDs +id_map+.
   def fix_placeholders!(id_map, placeholder_id = nil)
     nds.map! do |node_id|

-      if node_id < 0
+      if node_id.negative?

         new_id = id_map[:node][node_id]
         raise OSM::APIBadUserInput, "Placeholder node not found for reference #{node_id} in way #{id.nil? ? placeholder_id : id}" if new_id.nil?
 
         new_id = id_map[:node][node_id]
         raise OSM::APIBadUserInput, "Placeholder node not found for reference #{node_id} in way #{id.nil? ? placeholder_id : id}" if new_id.nil?