From cf3cf5216fa3697ad2e3c060fced6a7bbb16f4a4 Mon Sep 17 00:00:00 2001
From: mmd-osm <mmd.osm@gmail.com>
Date: Thu, 27 Jun 2019 18:33:12 +0200
Subject: [PATCH] Avoid unnecessary arrays

---
 app/controllers/api/nodes_controller.rb         | 2 +-
 app/controllers/api/old_controller.rb           | 8 +-------
 app/controllers/api/relations_controller.rb     | 2 +-
 app/controllers/api/ways_controller.rb          | 4 ++--
 app/views/api/nodes/show.xml.builder            | 2 +-
 app/views/api/old_nodes/version.xml.builder     | 2 +-
 app/views/api/old_relations/version.xml.builder | 2 +-
 app/views/api/old_ways/version.xml.builder      | 2 +-
 app/views/api/relations/show.xml.builder        | 2 +-
 app/views/api/ways/full.xml.builder             | 2 +-
 app/views/api/ways/show.xml.builder             | 2 +-
 11 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/app/controllers/api/nodes_controller.rb b/app/controllers/api/nodes_controller.rb
index 630149a74..891528a5f 100644
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -31,7 +31,7 @@ module Api
       response.last_modified = node.timestamp
 
       if node.visible
-        @nodes = [node]
+        @node = node
 
         # Render the result
         respond_to do |format|
diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb
index 39bb35ca9..bf3fcdb39 100644
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -28,11 +28,7 @@ module Api
                            @elements.unredacted
                          end
 
-      @elems = []
-
-      visible_elements.each do |element|
-        @elems << element
-      end
+      @elems = visible_elements
 
       # Render the result
       respond_to do |format|
@@ -47,8 +43,6 @@ module Api
       else
         response.last_modified = @old_element.timestamp
 
-        @elems = [@old_element]
-
         # Render the result
         respond_to do |format|
           format.xml
diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index 9f125cfd3..40d919ddc 100644
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -25,7 +25,7 @@ module Api
       relation = Relation.find(params[:id])
       response.last_modified = relation.timestamp
       if relation.visible
-        @relations = [relation]
+        @relation = relation
 
         # Render the result
         respond_to do |format|
diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb
index b8ce1010f..04c823ad2 100644
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -27,7 +27,7 @@ module Api
       response.last_modified = way.timestamp
 
       if way.visible
-        @ways = [way]
+        @way = way
 
         # Render the result
         respond_to do |format|
@@ -80,7 +80,7 @@ module Api
           end
         end
 
-        @ways = [way]
+        @way = way
 
         # Render the result
         respond_to do |format|
diff --git a/app/views/api/nodes/show.xml.builder b/app/views/api/nodes/show.xml.builder
index 1968de97a..48f7e314a 100644
--- a/app/views/api/nodes/show.xml.builder
+++ b/app/views/api/nodes/show.xml.builder
@@ -1,5 +1,5 @@
 xml.instruct!
 
 xml.osm(OSM::API.new.xml_root_attributes) do |osm|
-  osm << (render(@nodes) || "")
+  osm << (render(@node) || "")
 end
diff --git a/app/views/api/old_nodes/version.xml.builder b/app/views/api/old_nodes/version.xml.builder
index 905381ce9..c7b630d3a 100644
--- a/app/views/api/old_nodes/version.xml.builder
+++ b/app/views/api/old_nodes/version.xml.builder
@@ -1,5 +1,5 @@
 xml.instruct!
 
 xml.osm(OSM::API.new.xml_root_attributes) do |osm|
-  osm << (render(@elems) || "")
+  osm << (render(@old_element) || "")
 end
diff --git a/app/views/api/old_relations/version.xml.builder b/app/views/api/old_relations/version.xml.builder
index 905381ce9..c7b630d3a 100644
--- a/app/views/api/old_relations/version.xml.builder
+++ b/app/views/api/old_relations/version.xml.builder
@@ -1,5 +1,5 @@
 xml.instruct!
 
 xml.osm(OSM::API.new.xml_root_attributes) do |osm|
-  osm << (render(@elems) || "")
+  osm << (render(@old_element) || "")
 end
diff --git a/app/views/api/old_ways/version.xml.builder b/app/views/api/old_ways/version.xml.builder
index 905381ce9..c7b630d3a 100644
--- a/app/views/api/old_ways/version.xml.builder
+++ b/app/views/api/old_ways/version.xml.builder
@@ -1,5 +1,5 @@
 xml.instruct!
 
 xml.osm(OSM::API.new.xml_root_attributes) do |osm|
-  osm << (render(@elems) || "")
+  osm << (render(@old_element) || "")
 end
diff --git a/app/views/api/relations/show.xml.builder b/app/views/api/relations/show.xml.builder
index f39a20bb9..555eb4db5 100644
--- a/app/views/api/relations/show.xml.builder
+++ b/app/views/api/relations/show.xml.builder
@@ -1,5 +1,5 @@
 xml.instruct!
 
 xml.osm(OSM::API.new.xml_root_attributes) do |osm|
-  osm << (render(@relations) || "")
+  osm << (render(@relation) || "")
 end
diff --git a/app/views/api/ways/full.xml.builder b/app/views/api/ways/full.xml.builder
index d8b3aea80..025291638 100644
--- a/app/views/api/ways/full.xml.builder
+++ b/app/views/api/ways/full.xml.builder
@@ -2,5 +2,5 @@ xml.instruct!
 
 xml.osm(OSM::API.new.xml_root_attributes) do |osm|
   osm << (render(@nodes) || "")
-  osm << (render(@ways) || "")
+  osm << (render(@way) || "")
 end
diff --git a/app/views/api/ways/show.xml.builder b/app/views/api/ways/show.xml.builder
index bcb89cdc6..d520a0844 100644
--- a/app/views/api/ways/show.xml.builder
+++ b/app/views/api/ways/show.xml.builder
@@ -1,5 +1,5 @@
 xml.instruct!
 
 xml.osm(OSM::API.new.xml_root_attributes) do |osm|
-  osm << (render(@ways) || "")
+  osm << (render(@way) || "")
 end
-- 
2.43.2