Move Node.to_xml and to_xml_node out of model and into tests

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 84899d7fb4a8e7b609c0d3dd03d01271b145789f..bdf8cb47ee32438ab875f7c5bc17d5b431fabef5 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,3 +1,29 @@
+# == Schema Information
+#
+# Table name: nodes
+#
+#  node_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, primary key
+#  redaction_id :integer
+#
+# Indexes
+#
+#  nodes_changeset_id_idx  (changeset_id)
+#  nodes_tile_idx          (tile)
+#  nodes_timestamp_idx     (timestamp)
+#
+# Foreign Keys
+#
+#  nodes_changeset_id_fkey  (changeset_id => changesets.id)
+#  nodes_redaction_id_fkey  (redaction_id => redactions.id)
+#
+

 class OldNode < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
 class OldNode < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations


@@ -12,9 +38,9 @@ class OldNode < ActiveRecord::Base
 
   validates :changeset, :presence => true, :associated => true
   validates :latitude, :presence => true,
 
   validates :changeset, :presence => true, :associated => 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 :visible, :inclusion => [true, false]
 
   validates :timestamp, :presence => true
   validates :visible, :inclusion => [true, false]
 


@@ -55,7 +81,7 @@ class OldNode < ActiveRecord::Base
 
     add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
 
 
     add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
 

-    if self.visible?
+    if visible?

       el["lat"] = lat.to_s
       el["lon"] = lon.to_s
     end
       el["lat"] = lat.to_s
       el["lon"] = lon.to_s
     end