Geocode pre-filled values when the user presses 'Go'.

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index e5ba53852d76ee4fee03d83c08e6af50d2fa72d8..dbdcdd46d62dbaf2f0f591b29681c76d3af4f71a 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -31,19 +31,7 @@ class OldWay < ActiveRecord::Base
   end
 
   def save_with_dependencies!
-
-    # dont touch this unless you really have figured out why it's called
-    # (Rails doesn't deal well with the old ways table (called 'ways') because
-    # it doesn't have a unique key. It knows how to insert and auto_increment
-    # id and get it back but we have that and we want to get the 'version' back
-    # we could add another column but thats a lot of data. No, set_primary_key
-    # doesn't work either.
     save!
-    clear_aggregation_cache
-    clear_association_cache
-    @attributes.update(OldWay.where(:way_id => self.way_id, :timestamp => self.timestamp).order("version DESC").first.instance_variable_get('@attributes'))
-
-    # ok, you can touch from here on
 
     self.tags.each do |k,v|
       tag = OldWayTag.new
@@ -105,12 +93,10 @@ class OldWay < ActiveRecord::Base
   # (i.e. is it visible? are we actually reverting to an earlier version?)
 
   def get_nodes_undelete
-    points = []
-    self.nds.each do |n|
+    self.nds.collect do |n|
       node = Node.find(n)
-      points << [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]
+      [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]
     end
-    points
   end
   
   def get_nodes_revert(timestamp)