cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Declare api node relations as nested resources

Browse source
This commit is contained in:
Anton Khorev 2025-02-02 13:38:46 +03:00
parent 6a50a5e871
commit a6e614e44e
10 changed files with 112 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

34
test/controllers/api/relations_controller_test.rb
View file

@ -42,10 +42,6 @@ module Api
{ :controller => "api/relations", :action => "destroy", :id => "1" }
)
assert_routing(
{ :path => "/api/0.6/node/1/relations", :method => :get },
{ :controller => "api/relations", :action => "relations_for_node", :id => "1" }
)
assert_routing(
{ :path => "/api/0.6/way/1/relations", :method => :get },
{ :controller => "api/relations", :action => "relations_for_way", :id => "1" }
@ -54,10 +50,6 @@ module Api
{ :path => "/api/0.6/relation/1/relations", :method => :get },
{ :controller => "api/relations", :action => "relations_for_relation", :id => "1" }
)
assert_routing(
{ :path => "/api/0.6/node/1/relations.json", :method => :get },
{ :controller => "api/relations", :action => "relations_for_node", :id => "1", :format => "json" }
)
assert_routing(
{ :path => "/api/0.6/way/1/relations.json", :method => :get },
{ :controller => "api/relations", :action => "relations_for_way", :id => "1", :format => "json" }
@ -228,32 +220,6 @@ module Api
assert_equal node.id, js_nodes[0]["id"]
end
##
# check that all relations containing a particular node, and no extra
# relations, are returned from the relations_for_node call.
def test_relations_for_node
node = create(:node)
# should include relations with that node as a member
relation_with_node = create(:relation_member, :member => node).relation
# should ignore relations without that node as a member
_relation_without_node = create(:relation_member).relation
# should ignore relations with the node involved indirectly, via a way
way = create(:way_node, :node => node).way
_relation_with_way = create(:relation_member, :member => way).relation
# should ignore relations with the node involved indirectly, via a relation
second_relation = create(:relation_member, :member => node).relation
_super_relation = create(:relation_member, :member => second_relation).relation
# should combine multiple relation_member references into just one relation entry
create(:relation_member, :member => node, :relation => relation_with_node)
# should not include deleted relations
deleted_relation = create(:relation, :deleted)
create(:relation_member, :member => node, :relation => deleted_relation)
check_relations_for_element(node_relations_path(node), "node",
node.id,
[relation_with_node, second_relation])
end
def test_relations_for_way
way = create(:way)
# should include relations with that way as a member