X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e3ed9988ce5f57ed303326072f7f583b641e8774..b87983c2baf55d437c09e668188454d01b5f20b0:/test/controllers/api/map_controller_test.rb?ds=sidebyside diff --git a/test/controllers/api/map_controller_test.rb b/test/controllers/api/map_controller_test.rb index db83aaa9f..c050100ae 100644 --- a/test/controllers/api/map_controller_test.rb +++ b/test/controllers/api/map_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" module Api - class MapControllerTest < ActionController::TestCase + class MapControllerTest < ActionDispatch::IntegrationTest def setup super @badbigbbox = %w[-0.1,-0.1,1.1,1.1 10,10,11,11] @@ -13,7 +13,7 @@ module Api @goodbbox = %w[-0.1,-0.1,0.1,0.1 51.1,-0.1,51.2,0 -0.1,%20-0.1,%200.1,%200.1 -0.1edcd,-0.1d,0.1,0.1 -0.1E,-0.1E,0.1S,0.1N S0.1,W0.1,N0.1,E0.1] # That last item in the goodbbox really shouldn't be there, as the API should - # reall reject it, however this is to test to see if the api changes. + # really reject it, however this is to test to see if the api changes. end ## @@ -23,6 +23,87 @@ module Api { :path => "/api/0.6/map", :method => :get }, { :controller => "api/map", :action => "index" } ) + assert_routing( + { :path => "/api/0.6/map.json", :method => :get }, + { :controller => "api/map", :action => "index", :format => "json" } + ) + end + + ## + # test http accept headers + def test_http_accept_header + node = create(:node) + + minlon = node.lon - 0.1 + minlat = node.lat - 0.1 + maxlon = node.lon + 0.1 + maxlat = node.lat + 0.1 + bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" + + # Accept: XML format -> use XML + accept_header = accept_format_header("text/xml") + get 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + 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 + assert_response :not_acceptable, "text/json should fail" end # ------------------------------------- @@ -43,15 +124,24 @@ module Api maxlon = node.lon + 0.1 maxlat = node.lat + 0.1 bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" - get :index, :params => { :bbox => bbox } + get map_path(:bbox => bbox) if $VERBOSE print @request.to_yaml print @response.body end - assert_response :success, "Expected scucess with the map call" + assert_response :success, "Expected success with the map call" assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", :count => 1 do - assert_select "bounds[minlon='#{format('%.7f', minlon)}'][minlat='#{format('%.7f', minlat)}'][maxlon='#{format('%.7f', maxlon)}'][maxlat='#{format('%.7f', maxlat)}']", :count => 1 - assert_select "node[id='#{node.id}'][lat='#{format('%.7f', node.lat)}'][lon='#{format('%.7f', node.lon)}'][version='#{node.version}'][changeset='#{node.changeset_id}'][visible='#{node.visible}'][timestamp='#{node.timestamp.xmlschema}']", :count => 1 do + assert_select "bounds[minlon='#{format('%.7f', :lon => minlon)}']" \ + "[minlat='#{format('%.7f', :lat => minlat)}']" \ + "[maxlon='#{format('%.7f', :lon => maxlon)}']" \ + "[maxlat='#{format('%.7f', :lat => maxlat)}']", :count => 1 + assert_select "node[id='#{node.id}']" \ + "[lat='#{format('%.7f', :lat => node.lat)}']" \ + "[lon='#{format('%.7f', :lon => node.lon)}']" \ + "[version='#{node.version}']" \ + "[changeset='#{node.changeset_id}']" \ + "[visible='#{node.visible}']" \ + "[timestamp='#{node.timestamp.xmlschema}']", :count => 1 do # This should really be more generic assert_select "tag[k='#{tag.k}'][v='#{tag.v}']" end @@ -63,6 +153,54 @@ module Api end end + def test_map_json + node = create(:node, :lat => 7, :lon => 7) + tag = create(:node_tag, :node => node) + way1 = create(:way_node, :node => node).way + way2 = create(:way_node, :node => node).way + relation = create(:relation_member, :member => node).relation + + # Need to split the min/max lat/lon out into their own variables here + # so that we can test they are returned later. + minlon = node.lon - 0.1 + minlat = node.lat - 0.1 + maxlon = node.lon + 0.1 + maxlat = node.lat + 0.1 + bbox = "#{minlon},#{minlat},#{maxlon},#{maxlat}" + get map_path(:bbox => bbox, :format => "json") + if $VERBOSE + print @request.to_yaml + print @response.body + end + assert_response :success, "Expected success with the map call" + js = ActiveSupport::JSON.decode(@response.body) + assert_not_nil js + + assert_equal Settings.api_version, js["version"] + assert_equal Settings.generator, js["generator"] + assert_equal GeoRecord::Coord.new(minlon), js["bounds"]["minlon"] + assert_equal GeoRecord::Coord.new(minlat), js["bounds"]["minlat"] + assert_equal GeoRecord::Coord.new(maxlon), js["bounds"]["maxlon"] + assert_equal GeoRecord::Coord.new(maxlat), js["bounds"]["maxlat"] + + result_nodes = js["elements"].select { |a| a["type"] == "node" } + .select { |a| a["id"] == node.id } + .select { |a| a["lat"] == GeoRecord::Coord.new(node.lat) } + .select { |a| a["lon"] == GeoRecord::Coord.new(node.lon) } + .select { |a| a["version"] == node.version } + .select { |a| a["changeset"] == node.changeset_id } + .select { |a| a["timestamp"] == node.timestamp.xmlschema } + assert_equal(1, result_nodes.count) + result_node = result_nodes.first + + assert_equal result_node["tags"], tag.k => tag.v + assert_equal 2, (js["elements"].count { |a| a["type"] == "way" }) + assert_equal 1, (js["elements"].count { |a| a["type"] == "way" && a["id"] == way1.id }) + assert_equal 1, (js["elements"].count { |a| a["type"] == "way" && a["id"] == way2.id }) + assert_equal 1, (js["elements"].count { |a| a["type"] == "relation" }) + assert_equal 1, (js["elements"].count { |a| a["type"] == "relation" && a["id"] == relation.id }) + end + # This differs from the above test in that we are making the bbox exactly # the same as the node we are looking at def test_map_inclusive @@ -73,11 +211,20 @@ module Api relation = create(:relation_member, :member => node).relation bbox = "#{node.lon},#{node.lat},#{node.lon},#{node.lat}" - get :index, :params => { :bbox => bbox } + get 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 - assert_select "node[id='#{node.id}'][lat='#{format('%.7f', node.lat)}'][lon='#{format('%.7f', node.lon)}'][version='#{node.version}'][changeset='#{node.changeset_id}'][visible='#{node.visible}'][timestamp='#{node.timestamp.xmlschema}']", :count => 1 do + assert_select "bounds[minlon='#{node.lon}']" \ + "[minlat='#{node.lat}']" \ + "[maxlon='#{node.lon}']" \ + "[maxlat='#{node.lat}']", :count => 1 + assert_select "node[id='#{node.id}']" \ + "[lat='#{format('%.7f', :lat => node.lat)}']" \ + "[lon='#{format('%.7f', :lon => node.lon)}']" \ + "[version='#{node.version}']" \ + "[changeset='#{node.changeset_id}']" \ + "[visible='#{node.visible}']" \ + "[timestamp='#{node.timestamp.xmlschema}']", :count => 1 do # This should really be more generic assert_select "tag[k='#{tag.k}'][v='#{tag.v}']" end @@ -101,7 +248,7 @@ module Api relation = create(:relation_member, :member => way1).relation bbox = "#{node.lon},#{node.lat},#{node.lon},#{node.lat}" - get :index, :params => { :bbox => bbox } + get 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 @@ -118,7 +265,7 @@ module Api end def test_map_empty - get :index, :params => { :bbox => "179.998,89.998,179.999.1,89.999" } + get 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 @@ -129,14 +276,14 @@ module Api end def test_map_without_bbox - get :index + get map_path assert_response :bad_request - assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "A bbox param was expected" + 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 :index, :params => { :bbox => bbox } + get 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 @@ -144,15 +291,15 @@ module Api def test_bbox_malformed @badmalformedbbox.each do |bbox| - get :index, :params => { :bbox => bbox } + get map_path(:bbox => bbox) assert_response :bad_request, "The bbox:#{bbox} was expected to be malformed" - assert_equal "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "bbox: #{bbox}" + assert_equal "The parameter bbox must be of the form min_lon,min_lat,max_lon,max_lat", @response.body, "bbox: #{bbox}" end end def test_bbox_lon_mixedup @badlonmixedbbox.each do |bbox| - get :index, :params => { :bbox => bbox } + get 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 @@ -160,7 +307,7 @@ module Api def test_bbox_lat_mixedup @badlatmixedbbox.each do |bbox| - get :index, :params => { :bbox => bbox } + get 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