Merge remote-tracking branch 'upstream/pull/4958'

app/views/api/map/index.json.jbuilder

@@ -2,8 +2,8 @@ json.partial! "root_attributes"
 
 json.partial! "bounds"
 
-all = @nodes + @ways + @relations
-
-json.elements(all) do |obj|
-  json.partial! obj
+json.elements do
+  json.array! @nodes, :partial => "/api/nodes/node", :as => :node
+  json.array! @ways, :partial => "/api/ways/way", :as => :way
+  json.array! @relations, :partial => "/api/relations/relation", :as => :relation
 end

app/views/api/nodes/index.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements(@nodes) do |node|
-  json.partial! node
+json.elements do
+  json.array! @nodes, :partial => "node", :as => :node
 end

app/views/api/nodes/show.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements([@node]) do |node|
-  json.partial! node
+json.elements do
+  json.array! [@node], :partial => "node", :as => :node
 end

app/views/api/old_nodes/history.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements(@elems) do |old_node|
-  json.partial! old_node
+json.elements do
+  json.array! @elems, :partial => "old_node", :as => :old_node
 end

app/views/api/old_nodes/show.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements([@old_element]) do |old_node|
-  json.partial! old_node
+json.elements do
+  json.array! [@old_element], :partial => "old_node", :as => :old_node
 end

app/views/api/old_relations/history.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements(@elems) do |old_relation|
-  json.partial! old_relation
+json.elements do
+  json.array! @elems, :partial => "old_relation", :as => :old_relation
 end

app/views/api/old_relations/show.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements([@old_element]) do |old_relation|
-  json.partial! old_relation
+json.elements do
+  json.array! [@old_element], :partial => "old_relation", :as => :old_relation
 end

app/views/api/old_ways/history.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements(@elems) do |old_way|
-  json.partial! old_way
+json.elements do
+  json.array! @elems, :partial => "old_way", :as => :old_way
 end

app/views/api/old_ways/show.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements([@old_element]) do |old_way|
-  json.partial! old_way
+json.elements do
+  json.array! [@old_element], :partial => "old_way", :as => :old_way
 end

app/views/api/relations/full.json.jbuilder

@@ -1,7 +1,7 @@
 json.partial! "api/root_attributes"
 
-all = @nodes + @ways + @relations
-
-json.elements(all) do |obj|
-  json.partial! obj
+json.elements do
+  json.array! @nodes, :partial => "/api/nodes/node", :as => :node
+  json.array! @ways, :partial => "/api/ways/way", :as => :way
+  json.array! @relations, :partial => "/api/relations/relation", :as => :relation
 end

app/views/api/relations/index.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements(@relations) do |relation|
-  json.partial! relation
+json.elements do
+  json.array! @relations, :partial => "relation", :as => :relation
 end

app/views/api/relations/relations_for_node.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements(@relations) do |relation|
-  json.partial! relation
+json.elements do
+  json.array! @relations, :partial => "relation", :as => :relation
 end

app/views/api/relations/relations_for_relation.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements(@relations) do |relation|
-  json.partial! relation
+json.elements do
+  json.array! @relations, :partial => "relation", :as => :relation
 end

app/views/api/relations/relations_for_way.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements(@relations) do |relation|
-  json.partial! relation
+json.elements do
+  json.array! @relations, :partial => "relation", :as => :relation
 end

app/views/api/relations/show.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements([@relation]) do |relation|
-  json.partial! relation
+json.elements do
+  json.array! [@relation], :partial => "relation", :as => :relation
 end

app/views/api/ways/full.json.jbuilder

@@ -1,7 +1,6 @@
 json.partial! "api/root_attributes"
 
-all = @nodes + [@way]
-
-json.elements(all) do |obj|
-  json.partial! obj
+json.elements do
+  json.array! @nodes, :partial => "/api/nodes/node", :as => :node
+  json.array! [@way], :partial => "/api/ways/way", :as => :way
 end

app/views/api/ways/index.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements(@ways) do |way|
-  json.partial! way
+json.elements do
+  json.array! @ways, :partial => "way", :as => :way
 end

app/views/api/ways/show.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements([@way]) do |way|
-  json.partial! way
+json.elements do
+  json.array! [@way], :partial => "way", :as => :way
 end

app/views/api/ways/ways_for_node.json.jbuilder

@@ -1,5 +1,5 @@
 json.partial! "api/root_attributes"
 
-json.elements(@ways) do |way|
-  json.partial! way
+json.elements do
+  json.array! @ways, :partial => "way", :as => :way
 end