Fix remaining JSHint issues

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index dbdcdd46d62dbaf2f0f591b29681c76d3af4f71a..92fe19ffb52303ec0d543d4c9c64a322279eea9c 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -13,11 +13,11 @@ 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_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


@@ -27,25 +27,25 @@ class OldWay < ActiveRecord::Base
     old_way.version = way.version
     old_way.nds = way.nds
     old_way.tags = way.tags
     old_way.version = way.version
     old_way.nds = way.nds
     old_way.tags = way.tags

-    return old_way
+    old_way

   end
 
   def save_with_dependencies!
     save!
 
   end
 
   def save_with_dependencies!
     save!
 

-    self.tags.each do |k,v|
+    tags.each do |k, v|

       tag = OldWayTag.new
       tag.k = k
       tag.v = v
       tag = OldWayTag.new
       tag.k = k
       tag.v = v

-      tag.way_id = self.way_id
-      tag.version = self.version
+      tag.way_id = way_id
+      tag.version = version

       tag.save!
     end
 
     sequence = 1
       tag.save!
     end
 
     sequence = 1

-    self.nds.each do |n|
+    nds.each do |n|

       nd = OldWayNode.new
       nd = OldWayNode.new

-      nd.id = [self.way_id, self.version, sequence]
+      nd.id = [way_id, version, sequence]

       nd.node_id = n
       nd.save!
       sequence += 1
       nd.node_id = n
       nd.save!
       sequence += 1


@@ -53,61 +53,61 @@ class OldWay < ActiveRecord::Base
   end
 
   def nds
   end
 
   def nds

-    @nds ||= self.old_nodes.order(:sequence_id).collect { |n| n.node_id }
+    @nds ||= old_nodes.order(:sequence_id).collect(&:node_id)

   end
 
   def tags
   end
 
   def tags

-    @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }]
+    @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }]

   end
 
   end
 

-  def nds=(s)
-    @nds = s
-  end
+  attr_writer :nds

 
 

-  def tags=(t)
-    @tags = t
-  end
+  attr_writer :tags

 
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
 
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})

-    el = XML::Node.new 'way'
-    el['id'] = self.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)
 

-    self.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

-      
-    add_tags_to_xml_node(el, self.old_tags)

 
 

-    return el
+    add_tags_to_xml_node(el, old_tags)
+
+    el

   end
 
   # Read full version of old way
   # For get_nodes_undelete, uses same nodes, even if they've moved since
   end
 
   # 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

-    self.nds.collect do |n|
+    nds.collect do |n|

       node = Node.find(n)
       [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]
     end
   end
       node = Node.find(n)
       [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]
     end
   end

-  
+

   def get_nodes_revert(timestamp)
   def get_nodes_revert(timestamp)

-    points=[]
-    self.nds.each do |n|
-      oldnode = OldNode.where('node_id = ? AND timestamp <= ?', n, timestamp).unredacted.order("timestamp DESC").first
+    points = []
+    nds.each do |n|
+      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
-      if oldnode.lat != curnode.lat or oldnode.lon != curnode.lon or oldnode.tags != curnode.tags then
+      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
         # node has changed: if it's in other ways, give it a new id

-        if curnode.ways-[self.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
       end
       points << [oldnode.lon, oldnode.lat, id, curnode.version, oldnode.tags_as_hash, reuse]
     end


@@ -116,22 +116,22 @@ class OldWay < ActiveRecord::Base
 
   # Temporary method to match interface to nodes
   def tags_as_hash
 
   # Temporary method to match interface to nodes
   def tags_as_hash

-    return self.tags
+    tags

   end
 
   # Temporary method to match interface to ways
   def way_nodes
   end
 
   # Temporary method to match interface to ways
   def way_nodes

-    return self.old_nodes
+    old_nodes

   end
 
   # Pretend we're not in any relations
   def containing_relation_members
   end
 
   # Pretend we're not in any relations
   def containing_relation_members

-    return []
+    []

   end
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
   def is_latest_version?
   end
 
   # check whether this element is the latest version - that is,
   # has the same version as its "current" counterpart.
   def is_latest_version?

-    current_way.version == self.version
+    current_way.version == version

   end
 end
   end
 end