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

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

diff --git a/app/views/api/ways/full.json.jbuilder b/app/views/api/ways/full.json.jbuilder
index 9bd234fbe14b0b203a6ee4227dd2b851eafe50ff..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/map/root_attributes"
+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