Support using iD on Internet Explorer 11 and above

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 92fe19ffb52303ec0d543d4c9c64a322279eea9c..63c4d8b65d2d6c4acb24b3a3d111f0a105c9eb72 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -16,7 +16,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 +72,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 +116,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