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

[rails.git] / app / views / api / map / index.json.jbuilder

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"
 
 
 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
 end