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

diff --git a/app/views/api/map/index.json.jbuilder b/app/views/api/map/index.json.jbuilder
index 7cc983aef410b9e074ff1eaee05a4e8767a9d341..756884539538390ed33bbb49c6427a041857ff37 100644 (file)
--- a/app/views/api/map/index.json.jbuilder
+++ b/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

diff --git a/app/views/api/nodes/index.json.jbuilder b/app/views/api/nodes/index.json.jbuilder
index 3e3ceb4cc4b3796fb2489d976ce9b4ef264182ae..7708a3498def39f51b4daabc7b72d516515524db 100644 (file)
--- a/app/views/api/nodes/index.json.jbuilder
+++ b/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

diff --git a/app/views/api/nodes/show.json.jbuilder b/app/views/api/nodes/show.json.jbuilder
index 9974da82ffccab5e2785a80b69125a1f7da63c1f..bcbd29b5e82c14e561557ffd5838bb8ec3fb2538 100644 (file)
--- a/app/views/api/nodes/show.json.jbuilder
+++ b/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

diff --git a/app/views/api/old_nodes/history.json.jbuilder b/app/views/api/old_nodes/history.json.jbuilder
index 96e8cca2d30a9f722ac6647e9722f31ad3490c6d..3a800d07d55f670ac575f98ab78882f2fae04eba 100644 (file)
--- a/app/views/api/old_nodes/history.json.jbuilder
+++ b/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

diff --git a/app/views/api/old_nodes/show.json.jbuilder b/app/views/api/old_nodes/show.json.jbuilder
index f63e07d439105ae17ea0134aeea046fd982f06d8..c6929ea825bfe76fc211c2ac7492ea6eb9948730 100644 (file)
--- a/app/views/api/old_nodes/show.json.jbuilder
+++ b/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

diff --git a/app/views/api/old_relations/history.json.jbuilder b/app/views/api/old_relations/history.json.jbuilder
index 311a80a86f04af717dfc472cdcc5adcbcd5d7879..944bed023512dfd3886120213ccba3e08935fb0d 100644 (file)
--- a/app/views/api/old_relations/history.json.jbuilder
+++ b/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

diff --git a/app/views/api/old_relations/show.json.jbuilder b/app/views/api/old_relations/show.json.jbuilder
index 5b33e4b85073c3fc2330a641f857bba78609bcb4..bd767b3dfa5421a74271c1c26b09f6304edd8458 100644 (file)
--- a/app/views/api/old_relations/show.json.jbuilder
+++ b/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

diff --git a/app/views/api/old_ways/history.json.jbuilder b/app/views/api/old_ways/history.json.jbuilder
index b5cf80d095a72e65cd3b8f69e28efa90a596a457..9e98901f50643ca7d8e4a9224278842a8c43f73b 100644 (file)
--- a/app/views/api/old_ways/history.json.jbuilder
+++ b/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

diff --git a/app/views/api/old_ways/show.json.jbuilder b/app/views/api/old_ways/show.json.jbuilder
index c66488526a01ffdd713f8ab2f6af97c19c222262..ee21d0f4121270f77250647e4166755469386a0d 100644 (file)
--- a/app/views/api/old_ways/show.json.jbuilder
+++ b/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

diff --git a/app/views/api/relations/full.json.jbuilder b/app/views/api/relations/full.json.jbuilder
index 98cbbfc402ddac13ca60cfd4e929354a39eac964..16331a89e6fd9aac3226a8b273877cb5fbea78b0 100644 (file)
--- a/app/views/api/relations/full.json.jbuilder
+++ b/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

diff --git a/app/views/api/relations/index.json.jbuilder b/app/views/api/relations/index.json.jbuilder
index f170cb150d54f1fdd1c80ad6bc45feb03fb731ac..9b0f65bf1eb0fb09e20dee4c8102b6cd9c0da897 100644 (file)
--- a/app/views/api/relations/index.json.jbuilder
+++ b/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

diff --git a/app/views/api/relations/relations_for_node.json.jbuilder b/app/views/api/relations/relations_for_node.json.jbuilder
index f170cb150d54f1fdd1c80ad6bc45feb03fb731ac..9b0f65bf1eb0fb09e20dee4c8102b6cd9c0da897 100644 (file)
--- a/app/views/api/relations/relations_for_node.json.jbuilder
+++ b/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

diff --git a/app/views/api/relations/relations_for_relation.json.jbuilder b/app/views/api/relations/relations_for_relation.json.jbuilder
index f170cb150d54f1fdd1c80ad6bc45feb03fb731ac..9b0f65bf1eb0fb09e20dee4c8102b6cd9c0da897 100644 (file)
--- a/app/views/api/relations/relations_for_relation.json.jbuilder
+++ b/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

diff --git a/app/views/api/relations/relations_for_way.json.jbuilder b/app/views/api/relations/relations_for_way.json.jbuilder
index f170cb150d54f1fdd1c80ad6bc45feb03fb731ac..9b0f65bf1eb0fb09e20dee4c8102b6cd9c0da897 100644 (file)
--- a/app/views/api/relations/relations_for_way.json.jbuilder
+++ b/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

diff --git a/app/views/api/relations/show.json.jbuilder b/app/views/api/relations/show.json.jbuilder
index 7f85d0f250e381b310f9e7ced36e09dd28408ef0..e5da7cd3f48fa4553f70a2b2adb6cdf2c2d41214 100644 (file)
--- a/app/views/api/relations/show.json.jbuilder
+++ b/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

diff --git a/app/views/api/ways/full.json.jbuilder b/app/views/api/ways/full.json.jbuilder
index bebad5e9f9d7bf7787581cab629e1e55764c22d3..1bd127dacf3be00fa05026e04cf378b7da18b87e 100644 (file)
--- a/app/views/api/ways/full.json.jbuilder
+++ b/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

diff --git a/app/views/api/ways/index.json.jbuilder b/app/views/api/ways/index.json.jbuilder
index 19e59cfb8885d3ff00d9978d0faa9a8489fac154..7b8de5f1c975410e0f7dbc74ef089969bf9eaf01 100644 (file)
--- a/app/views/api/ways/index.json.jbuilder
+++ b/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

diff --git a/app/views/api/ways/show.json.jbuilder b/app/views/api/ways/show.json.jbuilder
index acb93c1e77adce6bc9b927e551710cb181c46d67..92e570d869f300204bb8d92eb9a20190b242f4de 100644 (file)
--- a/app/views/api/ways/show.json.jbuilder
+++ b/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

diff --git a/app/views/api/ways/ways_for_node.json.jbuilder b/app/views/api/ways/ways_for_node.json.jbuilder
index 19e59cfb8885d3ff00d9978d0faa9a8489fac154..7b8de5f1c975410e0f7dbc74ef089969bf9eaf01 100644 (file)
--- a/app/views/api/ways/ways_for_node.json.jbuilder
+++ b/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