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

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

diff --git a/app/views/api/relations/show.json.jbuilder b/app/views/api/relations/show.json.jbuilder
index 682ef0a2436e20efb5bcbccaa77dc13e3cd28d5c..16331a89e6fd9aac3226a8b273877cb5fbea78b0 100644 (file)
--- a/app/views/api/relations/show.json.jbuilder
+++ b/app/views/api/relations/show.json.jbuilder
@@ -1,5 +1,7 @@
-json.partial! "api/map/root_attributes"
+json.partial! "api/root_attributes"
 
-json.elements([@relation]) do |relation|
-  json.partial! relation
+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