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

Create api map resource

Browse source
This commit is contained in:
Anton Khorev 2025-01-24 10:47:58 +03:00
parent 8cf77a2f36
commit 01b5ed5d28
9 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

48
test/controllers/api/map_controller_test.rb → test/controllers/api/maps_controller_test.rb
View file

@ -1,7 +1,7 @@
require "test_helper"
module Api
class MapControllerTest < ActionDispatch::IntegrationTest
class MapsControllerTest < ActionDispatch::IntegrationTest
def setup
super
@badbigbbox = %w[-0.1,-0.1,1.1,1.1 10,10,11,11]
@ -21,11 +21,11 @@ module Api
def test_routes
assert_routing(
{ :path => "/api/0.6/map", :method => :get },
{ :controller => "api/map", :action => "index" }
{ :controller => "api/maps", :action => "show" }
)
assert_routing(
{ :path => "/api/0.6/map.json", :method => :get },
{ :controller => "api/map", :action => "index", :format => "json" }
{ :controller => "api/maps", :action => "show", :format => "json" }
)
end
@ -42,67 +42,67 @@ module Api
# Accept: XML format -> use XML
accept_header = accept_format_header("text/xml")
get map_path(:bbox => bbox), :headers => accept_header
get api_map_path(:bbox => bbox), :headers => accept_header
assert_response :success, "Expected success with the map call"
assert_equal "application/xml; charset=utf-8", @response.header["Content-Type"]
# Accept: Any format -> use XML
accept_header = accept_format_header("*/*")
get map_path(:bbox => bbox), :headers => accept_header
get api_map_path(:bbox => bbox), :headers => accept_header
assert_response :success, "Expected success with the map call"
assert_equal "application/xml; charset=utf-8", @response.header["Content-Type"]
# Accept: Any format, .json URL suffix -> use json
accept_header = accept_format_header("*/*")
get map_path(:bbox => bbox, :format => "json"), :headers => accept_header
get api_map_path(:bbox => bbox, :format => "json"), :headers => accept_header
assert_response :success, "Expected success with the map call"
assert_equal "application/json; charset=utf-8", @response.header["Content-Type"]
# Accept: Firefox header -> use XML
accept_header = accept_format_header("text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8")
get map_path(:bbox => bbox), :headers => accept_header
get api_map_path(:bbox => bbox), :headers => accept_header
assert_response :success, "Expected success with the map call"
assert_equal "application/xml; charset=utf-8", @response.header["Content-Type"]
# Accept: JOSM header text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2 -> use XML
# Note: JOSM's header does not comply with RFC 7231, section 5.3.1
accept_header = accept_format_header("text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2")
get map_path(:bbox => bbox), :headers => accept_header
get api_map_path(:bbox => bbox), :headers => accept_header
assert_response :success, "Expected success with the map call"
assert_equal "application/xml; charset=utf-8", @response.header["Content-Type"]
# Accept: text/plain, */* -> use XML
accept_header = accept_format_header("text/plain, */*")
get map_path(:bbox => bbox), :headers => accept_header
get api_map_path(:bbox => bbox), :headers => accept_header
assert_response :success, "Expected success with the map call"
assert_equal "application/xml; charset=utf-8", @response.header["Content-Type"]
# Accept: text/* -> use XML
accept_header = accept_format_header("text/*")
get map_path(:bbox => bbox), :headers => accept_header
get api_map_path(:bbox => bbox), :headers => accept_header
assert_response :success, "Expected success with the map call"
assert_equal "application/xml; charset=utf-8", @response.header["Content-Type"]
# Accept: json, */* format -> use json
accept_header = accept_format_header("application/json, */*")
get map_path(:bbox => bbox), :headers => accept_header
get api_map_path(:bbox => bbox), :headers => accept_header
assert_response :success, "Expected success with the map call"
assert_equal "application/json; charset=utf-8", @response.header["Content-Type"]
# Accept: json format -> use json
accept_header = accept_format_header("application/json")
get map_path(:bbox => bbox), :headers => accept_header
get api_map_path(:bbox => bbox), :headers => accept_header
assert_response :success, "Expected success with the map call"
assert_equal "application/json; charset=utf-8", @response.header["Content-Type"]
# text/json is in invalid format, return HTTP 406 Not acceptable
accept_header = accept_format_header("text/json")
get map_path(:bbox => bbox), :headers => accept_header
get api_map_path(:bbox => bbox), :headers => accept_header
assert_response :not_acceptable, "text/json should fail"
# image/jpeg is a format which we don't support, return HTTP 406 Not acceptable
accept_header = accept_format_header("image/jpeg")
get map_path(:bbox => bbox), :headers => accept_header
get api_map_path(:bbox => bbox), :headers => accept_header
assert_response :not_acceptable, "text/json should fail"
end
@ -124,7 +124,7 @@ module Api
maxlon = node.lon + 0.1
maxlat = node.lat + 0.1
bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
get map_path(:bbox => bbox)
get api_map_path(:bbox => bbox)
if $VERBOSE
print @request.to_yaml
print @response.body
@ -167,7 +167,7 @@ module Api
maxlon = node.lon + 0.1
maxlat = node.lat + 0.1
bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}"
get map_path(:bbox => bbox, :format => "json")
get api_map_path(:bbox => bbox, :format => "json")
if $VERBOSE
print @request.to_yaml
print @response.body
@ -211,7 +211,7 @@ module Api
relation = create(:relation_member, :member => node).relation
bbox = "#{node.lon},#{node.lat},#{node.lon},#{node.lat}"
get map_path(:bbox => bbox)
get api_map_path(:bbox => bbox)
assert_response :success, "The map call should have succeeded"
assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do
assert_select "bounds[minlon='#{node.lon}']" \
@ -248,7 +248,7 @@ module Api
relation = create(:relation_member, :member => way1).relation
bbox = "#{node.lon},#{node.lat},#{node.lon},#{node.lat}"
get map_path(:bbox => bbox)
get api_map_path(:bbox => bbox)
assert_response :success, "The map call should have succeeded"
assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do
assert_select "bounds[minlon='#{node.lon}'][minlat='#{node.lat}'][maxlon='#{node.lon}'][maxlat='#{node.lat}']", :count => 1
@ -265,7 +265,7 @@ module Api
end
def test_map_empty
get map_path(:bbox => "179.998,89.998,179.999.1,89.999")
get api_map_path(:bbox => "179.998,89.998,179.999.1,89.999")
assert_response :success, "The map call should have succeeded"
assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do
assert_select "bounds[minlon='179.9980000'][minlat='89.9980000'][maxlon='179.9990000'][maxlat='89.9990000']", :count => 1
@ -276,14 +276,14 @@ module Api
end
def test_map_without_bbox
get map_path
get api_map_path
assert_response :bad_request
assert_equal "The parameter bbox is required", @response.body, "A bbox param was expected"
end
def test_bbox_too_big
@badbigbbox.each do |bbox|
get map_path(:bbox => bbox)
get api_map_path(:bbox => bbox)
assert_response :bad_request, "The bbox:#{bbox} was expected to be too big"
assert_equal "The maximum bbox size is #{Settings.max_request_area}, and your request was too large. Either request a smaller area, or use planet.osm", @response.body, "bbox: #{bbox}"
end
@ -291,7 +291,7 @@ module Api
def test_bbox_malformed
@badmalformedbbox.each do |bbox|
get map_path(:bbox => bbox)
get api_map_path(:bbox => bbox)
assert_response :bad_request, "The bbox:#{bbox} was expected to be malformed"
assert_equal "The parameter bbox must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "bbox: #{bbox}"
end
@ -299,7 +299,7 @@ module Api
def test_bbox_lon_mixedup
@badlonmixedbbox.each do |bbox|
get map_path(:bbox => bbox)
get api_map_path(:bbox => bbox)
assert_response :bad_request, "The bbox:#{bbox} was expected to have the longitude mixed up"
assert_equal "The minimum longitude must be less than the maximum longitude, but it wasn't", @response.body, "bbox: #{bbox}"
end
@ -307,7 +307,7 @@ module Api
def test_bbox_lat_mixedup
@badlatmixedbbox.each do |bbox|
get map_path(:bbox => bbox)
get api_map_path(:bbox => bbox)
assert_response :bad_request, "The bbox:#{bbox} was expected to have the latitude mixed up"
assert_equal "The minimum latitude must be less than the maximum latitude, but it wasn't", @response.body, "bbox: #{bbox}"
end