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

[rails.git] / app / views / api / relations / full.json.jbuilder

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