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

Clean up after creating nested relation resources

Browse source
This commit is contained in:
Anton Khorev 2025-02-02 14:32:57 +03:00
parent f696b5439e
commit 18b8e0cb34
2 changed files with 0 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/api/relations_controller.rb
View file

@ -122,23 +122,5 @@ module Api
head :bad_request
end
end
private
def relations_for_object(objtype)
relationids = RelationMember.where(:member_type => objtype, :member_id => params[:id]).collect(&:relation_id).uniq
@relations = []
Relation.find(relationids).each do |relation|
@relations << relation if relation.visible
end
# Render the result
respond_to do |format|
format.xml
format.json
end
end
end
end

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

@ -1013,25 +1013,6 @@ module Api
private
def check_relations_for_element(path, type, id, expected_relations)
# check the "relations for relation" mode
get path
assert_response :success
# count one osm element
assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
# we should have only the expected number of relations
assert_select "osm>relation", expected_relations.size
# and each of them should contain the element we originally searched for
expected_relations.each do |relation|
# The relation should appear once, but the element could appear multiple times
assert_select "osm>relation[id='#{relation.id}']", 1
assert_select "osm>relation[id='#{relation.id}']>member[type='#{type}'][ref='#{id}']"
end
end
##
# checks that the XML document and the string arguments have
# members in the same order.