Cleanup trailing whitespace

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 408dd72c7e93dab73f0618c2b6849ad1721b5329..167ed303a1200c1df3a5577c3a69ff28e46c1d05 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -17,7 +17,7 @@ class OldWay < ActiveRecord::Base
   has_many :old_tags, :class_name => 'OldWayTag', :foreign_key => [:way_id, :version]
 
   validates_associated :changeset
   has_many :old_tags, :class_name => 'OldWayTag', :foreign_key => [:way_id, :version]
 
   validates_associated :changeset

-  
+

   def self.from_way(way)
     old_way = OldWay.new
     old_way.visible = way.visible
   def self.from_way(way)
     old_way = OldWay.new
     old_way.visible = way.visible


@@ -31,19 +31,7 @@ class OldWay < ActiveRecord::Base
   end
 
   def save_with_dependencies!
   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!
     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
 
     self.tags.each do |k,v|
       tag = OldWayTag.new


@@ -65,24 +53,11 @@ class OldWay < ActiveRecord::Base
   end
 
   def nds
   end
 
   def nds

-    unless @nds
-      @nds = Array.new
-      self.old_nodes.order(:sequence_id).each do |nd|
-        @nds += [nd.node_id]
-      end
-    end
-    @nds
+    @nds ||= self.old_nodes.order(:sequence_id).collect { |n| n.node_id }

   end
 
   def tags
   end
 
   def tags

-    unless @tags
-      @tags = Hash.new
-      self.old_tags.each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags = Hash.new unless @tags
-    @tags
+    @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }]

   end
 
   def nds=(s)
   end
 
   def nds=(s)


@@ -104,7 +79,7 @@ class OldWay < ActiveRecord::Base
       node_el['ref'] = nd.node_id.to_s
       el << node_el
     end
       node_el['ref'] = nd.node_id.to_s
       el << node_el
     end

-      
+

     add_tags_to_xml_node(el, self.old_tags)
 
     return el
     add_tags_to_xml_node(el, self.old_tags)
 
     return el


@@ -112,20 +87,18 @@ class OldWay < ActiveRecord::Base
 
   # Read full version of old way
   # For get_nodes_undelete, uses same nodes, even if they've moved since
 
   # Read full version of old way
   # For get_nodes_undelete, uses same nodes, even if they've moved since

-  # For get_nodes_revert,   allocates new ids 
+  # For get_nodes_revert,   allocates new ids

   # Currently returns Potlatch-style array
   # where [5] indicates whether latest version is usable as is (boolean)
   # (i.e. is it visible? are we actually reverting to an earlier version?)
 
   def get_nodes_undelete
   # Currently returns Potlatch-style array
   # where [5] indicates whether latest version is usable as is (boolean)
   # (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)
       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
     end

-    points

   end
   end

-  
+

   def get_nodes_revert(timestamp)
     points=[]
     self.nds.each do |n|
   def get_nodes_revert(timestamp)
     points=[]
     self.nds.each do |n|