UI changes + Redirection after creating report fixed

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index c088ee129388028bda6353b593664b61aa063bfc..63c4d8b65d2d6c4acb24b3a3d111f0a105c9eb72 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -13,10 +13,12 @@ class OldWay < ActiveRecord::Base
   belongs_to :redaction
   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
 
   belongs_to :redaction
   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
 

-  has_many :old_nodes, :class_name => 'OldWayNode', :foreign_key => [:way_id, :version]
-  has_many :old_tags, :class_name => 'OldWayTag', :foreign_key => [:way_id, :version]
+  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
 
   def self.from_way(way)
     old_way = OldWay.new


@@ -65,14 +67,14 @@ class OldWay < ActiveRecord::Base
   attr_writer :tags
 
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
   attr_writer :tags
 
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})

-    el = XML::Node.new 'way'
-    el['id'] = way_id.to_s
+    el = XML::Node.new "way"
+    el["id"] = way_id.to_s

 
     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)
 

-    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
+    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
     end
 
       el << node_el
     end
 


@@ -98,23 +100,22 @@ class OldWay < ActiveRecord::Base
   def get_nodes_revert(timestamp)
     points = []
     nds.each do |n|
   def get_nodes_revert(timestamp)
     points = []
     nds.each do |n|

-      oldnode = OldNode.where('node_id = ? AND timestamp <= ?', n, timestamp).unredacted.order("timestamp DESC").first
+      oldnode = OldNode.where("node_id = ? AND timestamp <= ?", n, timestamp).unredacted.order("timestamp DESC").first

       curnode = Node.find(n)
       curnode = Node.find(n)

-      id = n; reuse = curnode.visible
+      id = n
+      reuse = curnode.visible

       if oldnode.lat != curnode.lat || oldnode.lon != curnode.lon || oldnode.tags != curnode.tags
         # node has changed: if it's in other ways, give it a new id
       if oldnode.lat != curnode.lat || oldnode.lon != curnode.lon || oldnode.tags != curnode.tags
         # node has changed: if it's in other ways, give it a new id

-        if curnode.ways - [way_id] then id = -1; reuse = false end
+        if curnode.ways - [way_id]
+          id = -1
+          reuse = false
+        end

       end
       points << [oldnode.lon, oldnode.lat, id, curnode.version, oldnode.tags_as_hash, reuse]
     end
     points
   end
 
       end
       points << [oldnode.lon, oldnode.lat, id, curnode.version, oldnode.tags_as_hash, reuse]
     end
     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
   # Temporary method to match interface to ways
   def way_nodes
     old_nodes