Fix rubocop style issues

[rails.git] / app / controllers / relation_controller.rb

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index f77f722f62f48e689de53e707908ef88c97d4ad6..132b78e9b54dc2f1fcb670ef0b1f24e52a803223 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -102,24 +102,27 @@ class RelationController < ApplicationController
       user_display_name_cache = {}
 
       nodes.each do |node|
       user_display_name_cache = {}
 
       nodes.each do |node|

-        if node.visible? # should be unnecessary if data is consistent.
-          doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
-          visible_nodes[node.id] = node
-          visible_members["Node"][node.id] = true
-        end
+        next unless node.visible? # should be unnecessary if data is consistent.
+
+        doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+        visible_nodes[node.id] = node
+        visible_members["Node"][node.id] = true

       end
       end

+

       ways.each do |way|
       ways.each do |way|

-        if way.visible? # should be unnecessary if data is consistent.
-          doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
-          visible_members["Way"][way.id] = true
-        end
+        next unless way.visible? # should be unnecessary if data is consistent.
+
+        doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
+        visible_members["Way"][way.id] = true

       end
       end

+

       relations.each do |rel|
       relations.each do |rel|

-        if rel.visible? # should be unnecessary if data is consistent.
-          doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
-          visible_members["Relation"][rel.id] = true
-        end
+        next unless rel.visible? # should be unnecessary if data is consistent.
+
+        doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache)
+        visible_members["Relation"][rel.id] = true

       end
       end

+

       # finally add self and output
       doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache)
       render :text => doc.to_s, :content_type => "text/xml"
       # finally add self and output
       doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache)
       render :text => doc.to_s, :content_type => "text/xml"