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

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 92fe19ffb52303ec0d543d4c9c64a322279eea9c..31e230c3869e2ee197f46a8de823834319536c5f 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,3 +1,25 @@
+# == Schema Information
+#
+# Table name: ways
+#
+#  way_id       :bigint(8)        default(0), not null, primary key
+#  changeset_id :bigint(8)        not null
+#  timestamp    :datetime         not null
+#  version      :bigint(8)        not null, primary key
+#  visible      :boolean          default(TRUE), not null
+#  redaction_id :integer
+#
+# Indexes
+#
+#  ways_changeset_id_idx  (changeset_id)
+#  ways_timestamp_idx     (timestamp)
+#
+# Foreign Keys
+#
+#  ways_changeset_id_fkey  (changeset_id => changesets.id)
+#  ways_redaction_id_fkey  (redaction_id => redactions.id)
+#
+
 class OldWay < ActiveRecord::Base
   include ConsistencyValidations
   include ObjectMetadata
@@ -16,7 +38,9 @@ class OldWay < ActiveRecord::Base
   has_many :old_nodes, :class_name => "OldWayNode", :foreign_key => [:way_id, :version]
   has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version]
 
-  validates_associated :changeset
+  validates :changeset, :presence => true, :associated => true
+  validates :timestamp, :presence => true
+  validates :visible, :inclusion => [true, false]
 
   def self.from_way(way)
     old_way = OldWay.new
@@ -70,7 +94,7 @@ class OldWay < ActiveRecord::Base
 
     add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
 
-    old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
+    old_nodes.each do |nd| # FIXME: need to make sure they come back in the right order
       node_el = XML::Node.new "nd"
       node_el["ref"] = nd.node_id.to_s
       el << node_el
@@ -114,11 +138,6 @@ class OldWay < ActiveRecord::Base
     points
   end
 
-  # Temporary method to match interface to nodes
-  def tags_as_hash
-    tags
-  end
-
   # Temporary method to match interface to ways
   def way_nodes
     old_nodes