From: mmd-osm Date: Wed, 22 Jan 2020 21:47:47 +0000 (+0100) Subject: JSON: move root_attributes to shared folder X-Git-Tag: live~2198^2 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7fcb76aa9a627ef18bfdecf77dfb096ba03d0490 JSON: move root_attributes to shared folder --- diff --git a/app/views/api/map/_root_attributes.json.jbuilder b/app/views/api/_root_attributes.json.jbuilder similarity index 100% rename from app/views/api/map/_root_attributes.json.jbuilder rename to app/views/api/_root_attributes.json.jbuilder diff --git a/app/views/api/nodes/index.json.jbuilder b/app/views/api/nodes/index.json.jbuilder index f42f7563b..3e3ceb4cc 100644 --- a/app/views/api/nodes/index.json.jbuilder +++ b/app/views/api/nodes/index.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements(@nodes) do |node| json.partial! node diff --git a/app/views/api/nodes/show.json.jbuilder b/app/views/api/nodes/show.json.jbuilder index c87777a87..9974da82f 100644 --- a/app/views/api/nodes/show.json.jbuilder +++ b/app/views/api/nodes/show.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements([@node]) do |node| json.partial! node diff --git a/app/views/api/old_nodes/history.json.jbuilder b/app/views/api/old_nodes/history.json.jbuilder index b0e97e832..96e8cca2d 100644 --- a/app/views/api/old_nodes/history.json.jbuilder +++ b/app/views/api/old_nodes/history.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements(@elems) do |old_node| json.partial! old_node diff --git a/app/views/api/old_nodes/version.json.jbuilder b/app/views/api/old_nodes/version.json.jbuilder index 992230bc0..f63e07d43 100644 --- a/app/views/api/old_nodes/version.json.jbuilder +++ b/app/views/api/old_nodes/version.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements([@old_element]) do |old_node| json.partial! old_node diff --git a/app/views/api/old_relations/history.json.jbuilder b/app/views/api/old_relations/history.json.jbuilder index c5dacae0a..311a80a86 100644 --- a/app/views/api/old_relations/history.json.jbuilder +++ b/app/views/api/old_relations/history.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements(@elems) do |old_relation| json.partial! old_relation diff --git a/app/views/api/old_relations/version.json.jbuilder b/app/views/api/old_relations/version.json.jbuilder index b4018429b..5b33e4b85 100644 --- a/app/views/api/old_relations/version.json.jbuilder +++ b/app/views/api/old_relations/version.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements([@old_element]) do |old_relation| json.partial! old_relation diff --git a/app/views/api/old_ways/history.json.jbuilder b/app/views/api/old_ways/history.json.jbuilder index b231d7de1..b5cf80d09 100644 --- a/app/views/api/old_ways/history.json.jbuilder +++ b/app/views/api/old_ways/history.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements(@elems) do |old_way| json.partial! old_way diff --git a/app/views/api/old_ways/version.json.jbuilder b/app/views/api/old_ways/version.json.jbuilder index bb261c1c5..c66488526 100644 --- a/app/views/api/old_ways/version.json.jbuilder +++ b/app/views/api/old_ways/version.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements([@old_element]) do |old_way| json.partial! old_way diff --git a/app/views/api/relations/full.json.jbuilder b/app/views/api/relations/full.json.jbuilder index 268de01ca..98cbbfc40 100644 --- a/app/views/api/relations/full.json.jbuilder +++ b/app/views/api/relations/full.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" all = @nodes + @ways + @relations diff --git a/app/views/api/relations/index.json.jbuilder b/app/views/api/relations/index.json.jbuilder index 25c54fc6f..f170cb150 100644 --- a/app/views/api/relations/index.json.jbuilder +++ b/app/views/api/relations/index.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements(@relations) do |relation| json.partial! relation diff --git a/app/views/api/relations/relations_for_node.json.jbuilder b/app/views/api/relations/relations_for_node.json.jbuilder index 25c54fc6f..f170cb150 100644 --- a/app/views/api/relations/relations_for_node.json.jbuilder +++ b/app/views/api/relations/relations_for_node.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements(@relations) do |relation| json.partial! relation diff --git a/app/views/api/relations/relations_for_relation.json.jbuilder b/app/views/api/relations/relations_for_relation.json.jbuilder index 25c54fc6f..f170cb150 100644 --- a/app/views/api/relations/relations_for_relation.json.jbuilder +++ b/app/views/api/relations/relations_for_relation.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements(@relations) do |relation| json.partial! relation diff --git a/app/views/api/relations/relations_for_way.json.jbuilder b/app/views/api/relations/relations_for_way.json.jbuilder index 25c54fc6f..f170cb150 100644 --- a/app/views/api/relations/relations_for_way.json.jbuilder +++ b/app/views/api/relations/relations_for_way.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements(@relations) do |relation| json.partial! relation diff --git a/app/views/api/relations/show.json.jbuilder b/app/views/api/relations/show.json.jbuilder index 682ef0a24..7f85d0f25 100644 --- a/app/views/api/relations/show.json.jbuilder +++ b/app/views/api/relations/show.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements([@relation]) do |relation| json.partial! relation diff --git a/app/views/api/ways/full.json.jbuilder b/app/views/api/ways/full.json.jbuilder index 9bd234fbe..bebad5e9f 100644 --- a/app/views/api/ways/full.json.jbuilder +++ b/app/views/api/ways/full.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" all = @nodes + [@way] diff --git a/app/views/api/ways/index.json.jbuilder b/app/views/api/ways/index.json.jbuilder index e1dbd4347..19e59cfb8 100644 --- a/app/views/api/ways/index.json.jbuilder +++ b/app/views/api/ways/index.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements(@ways) do |way| json.partial! way diff --git a/app/views/api/ways/show.json.jbuilder b/app/views/api/ways/show.json.jbuilder index e5cd31fed..acb93c1e7 100644 --- a/app/views/api/ways/show.json.jbuilder +++ b/app/views/api/ways/show.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements([@way]) do |way| json.partial! way diff --git a/app/views/api/ways/ways_for_node.json.jbuilder b/app/views/api/ways/ways_for_node.json.jbuilder index e1dbd4347..19e59cfb8 100644 --- a/app/views/api/ways/ways_for_node.json.jbuilder +++ b/app/views/api/ways/ways_for_node.json.jbuilder @@ -1,4 +1,4 @@ -json.partial! "api/map/root_attributes" +json.partial! "api/root_attributes" json.elements(@ways) do |way| json.partial! way