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

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

diff --git a/app/models/node.rb b/app/models/node.rb
index f8559dca75d74431153342f4c4c987281a5354e8..2e71813ff948e853a429df6764b4ca375f220ce0 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,3 +1,26 @@
+# == Schema Information
+#
+# Table name: current_nodes
+#
+#  id           :bigint(8)        not null, primary key
+#  latitude     :integer          not null
+#  longitude    :integer          not null
+#  changeset_id :bigint(8)        not null
+#  visible      :boolean          not null
+#  timestamp    :datetime         not null
+#  tile         :bigint(8)        not null
+#  version      :bigint(8)        not null
+#
+# Indexes
+#
+#  current_nodes_tile_idx       (tile)
+#  current_nodes_timestamp_idx  (timestamp)
+#
+# Foreign Keys
+#
+#  current_nodes_changeset_id_fkey  (changeset_id => changesets.id)
+#
+

 class Node < ActiveRecord::Base
   require "xml/libxml"
 
 class Node < ActiveRecord::Base
   require "xml/libxml"
 


@@ -24,15 +47,15 @@ class Node < 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 :latitude, :presence => true,
   validates :latitude, :presence => true,

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

   validates :longitude, :presence => 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]
   validates :timestamp, :presence => true
   validates :changeset, :associated => true
   validates :visible, :inclusion => [true, false]


@@ -56,8 +79,8 @@ class Node < ActiveRecord::Base
       return Node.from_xml_node(pt, create)
     end
     raise OSM::APIBadXMLError.new("node", xml, "XML doesn't contain an osm/node element.")
       return Node.from_xml_node(pt, create)
     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)
   end
 
   def self.from_xml_node(pt, create = false)


@@ -65,23 +88,27 @@ class Node < ActiveRecord::Base
 
     raise OSM::APIBadXMLError.new("node", pt, "lat missing") if pt["lat"].nil?
     raise OSM::APIBadXMLError.new("node", pt, "lon missing") if pt["lon"].nil?
 
     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.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
 
     node.changeset_id = pt["changeset"].to_i
 

-    raise OSM::APIBadUserInput.new("The node is outside this world") unless node.in_world?
+    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?
 
     # 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.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
       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

-      raise OSM::APIBadUserInput.new("ID of node cannot be zero when updating.") if node.id.zero?
+      raise OSM::APIBadUserInput, "ID of node cannot be zero when updating." if node.id.zero?

     end
 
     # We don't care about the time, as it is explicitly set on create/update/delete
     end
 
     # We don't care about the time, as it is explicitly set on create/update/delete


@@ -96,6 +123,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?
     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
 
       node.add_tag_key_val(tag["k"], tag["v"])
     end
 


@@ -120,10 +148,10 @@ class Node < ActiveRecord::Base
       lock!
       check_consistency(self, new_node, user)
       ways = Way.joins(:way_nodes).where(:visible => true, :current_way_nodes => { :node_id => id }).order(:id)
       lock!
       check_consistency(self, new_node, user)
       ways = Way.joins(:way_nodes).where(:visible => true, :current_way_nodes => { :node_id => id }).order(:id)

-      raise OSM::APIPreconditionFailedError.new("Node #{id} is still used by ways #{ways.collect(&:id).join(',')}.") unless ways.empty?
+      raise OSM::APIPreconditionFailedError, "Node #{id} is still used by ways #{ways.collect(&:id).join(',')}." unless ways.empty?

 
       rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Node", :member_id => id }).order(:id)
 
       rels = Relation.joins(:relation_members).where(:visible => true, :current_relation_members => { :member_type => "Node", :member_id => id }).order(:id)

-      raise OSM::APIPreconditionFailedError.new("Node #{id} is still used by relations #{rels.collect(&:id).join(',')}.") unless rels.empty?
+      raise OSM::APIPreconditionFailedError, "Node #{id} is still used by relations #{rels.collect(&:id).join(',')}." unless rels.empty?

 
       self.changeset_id = new_node.changeset_id
       self.tags = {}
 
       self.changeset_id = new_node.changeset_id
       self.tags = {}


@@ -172,28 +200,6 @@ class Node < ActiveRecord::Base
     save_with_history!
   end
 
     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_as_hash
     tags
   end


@@ -205,7 +211,7 @@ class Node < ActiveRecord::Base
   attr_writer :tags
 
   def add_tag_key_val(k, v)
   attr_writer :tags
 
   def add_tag_key_val(k, v)

-    @tags = {} unless @tags
+    @tags ||= {}

 
     # duplicate tags are now forbidden, so we can't allow values
     # in the hash to be overwritten.
 
     # duplicate tags are now forbidden, so we can't allow values
     # in the hash to be overwritten.


@@ -243,7 +249,7 @@ class Node < ActiveRecord::Base
 
       # Create a NodeTag
       tags = self.tags
 
       # Create a NodeTag
       tags = self.tags

-      NodeTag.delete_all(:node_id => id)
+      NodeTag.where(:node_id => id).delete_all

       tags.each do |k, v|
         tag = NodeTag.new
         tag.node_id = id
       tags.each do |k, v|
         tag = NodeTag.new
         tag.node_id = id