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

Testing, testing, testing...

Browse source
This commit is contained in:
Tom Hughes 2015-03-01 23:05:18 +00:00
parent 33790824d6
commit 1891efef06
11 changed files with 604 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/geocoder_controller.rb
View file

@ -185,9 +185,9 @@ class GeocoderController < ApplicationController
end
render :action => "results"
# rescue StandardError => ex
# @error = "Error contacting nominatim.openstreetmap.org: #{ex.to_s}"
# render :action => "error"
rescue StandardError => ex
@error = "Error contacting nominatim.openstreetmap.org: #{ex}"
render :action => "error"
end
def search_geonames
@ -217,7 +217,7 @@ class GeocoderController < ApplicationController
render :action => "results"
rescue StandardError => ex
@error = "Error contacting ws.geonames.org: #{ex}"
@error = "Error contacting api.geonames.org: #{ex}"
render :action => "error"
end
@ -279,7 +279,7 @@ class GeocoderController < ApplicationController
render :action => "results"
rescue StandardError => ex
@error = "Error contacting ws.geonames.org: #{ex}"
@error = "Error contacting api.geonames.org: #{ex}"
render :action => "error"
end

2
config/example.application.yml
View file

@ -100,3 +100,5 @@ production:
test:
<<: *defaults
# Geonames credentials for testing
geonames_username: "dummy"

11
test/controllers/browse_controller_test.rb
View file

@ -71,6 +71,7 @@ class BrowseControllerTest < ActionController::TestCase
def test_read_changeset
browse_check "changeset", changesets(:normal_user_first_change).id, "browse/changeset"
browse_check "changeset", changesets(:public_user_first_change).id, "browse/changeset"
end
def test_read_note
@ -150,6 +151,16 @@ class BrowseControllerTest < ActionController::TestCase
get type, :id => -10 # we won't have an id that's negative
end
get type, :id => 0
assert_response :not_found
assert_template "browse/not_found"
assert_template :layout => "map"
xhr :get, type, :id => 0
assert_response :not_found
assert_template "browse/not_found"
assert_template :layout => "xhr"
get type, :id => id
assert_response :success
assert_template template

222
test/controllers/geocoder_controller_test.rb
View file

@ -272,42 +272,242 @@ class GeocoderControllerTest < ActionController::TestCase
##
# Test identification fall through to the default case
def test_identify_default
search_check "foo bar baz", ["osm_nominatim"]
search_check "foo bar baz", %w(osm_nominatim geonames)
end
##
# Test the builtin latitude+longitude search
def test_search_latlon
xhr :get, :search_latlon, :lat => 1.23, :lon => 4.56, :zoom => 16
results_check :name => "1.23, 4.56", :lat => 1.23, :lon => 4.56, :zoom => 16
xhr :get, :search_latlon, :lat => -91.23, :lon => 4.56, :zoom => 16
results_check_error "Latitude -91.23 out of range"
xhr :get, :search_latlon, :lat => 91.23, :lon => 4.56, :zoom => 16
results_check_error "Latitude 91.23 out of range"
xhr :get, :search_latlon, :lat => 1.23, :lon => -180.23, :zoom => 16
results_check_error "Longitude -180.23 out of range"
xhr :get, :search_latlon, :lat => 1.23, :lon => 180.23, :zoom => 16
results_check_error "Longitude 180.23 out of range"
end
##
# Test the US postcode search
def test_search_us_postcode
with_http_stubs "geocoder_us" do
xhr :get, :search_us_postcode,
:query => "90210", :zoom => 10,
:minlon => -0.559, :minlat => 51.217,
:maxlon => 0.836, :maxlat => 51.766
results_check :prefix => "Beverly Hills, CA,", :name => "90210",
:lat => 34.088808, :lon => -118.40612
xhr :get, :search_us_postcode,
:query => "00000", :zoom => 10,
:minlon => -0.559, :minlat => 51.217,
:maxlon => 0.836, :maxlat => 51.766
results_check
end
end
##
# Test the UK postcode search
def test_search_uk_postcode
with_http_stubs "npemap" do
xhr :get, :search_uk_postcode,
:query => "CV4 7AL", :zoom => 10,
:minlon => -0.559, :minlat => 51.217,
:maxlon => 0.836, :maxlat => 51.766
results_check :name => "CV4 7AL", :lat => 52.381748701968, :lon => -1.56176420939232
xhr :get, :search_uk_postcode,
:query => "XX9 9XX", :zoom => 10,
:minlon => -0.559, :minlat => 51.217,
:maxlon => 0.836, :maxlat => 51.766
results_check
end
end
##
# Test the Canadian postcode search
def test_search_ca_postcode
with_http_stubs "geocoder_ca" do
xhr :get, :search_ca_postcode,
:query => "A1B 2C3", :zoom => 10,
:minlon => -0.559, :minlat => 51.217,
:maxlon => 0.836, :maxlat => 51.766
results_check :name => "A1B 2C3", :lat => "47.172520", :lon => "-55.440515"
xhr :get, :search_ca_postcode,
:query => "k1a 0b1", :zoom => 10,
:minlon => -0.559, :minlat => 51.217,
:maxlon => 0.836, :maxlat => 51.766
results_check :name => "K1A 0B1", :lat => "45.375437", :lon => "-75.691041"
xhr :get, :search_ca_postcode,
:query => "Q0Q 0Q0", :zoom => 10,
:minlon => -0.559, :minlat => 51.217,
:maxlon => 0.836, :maxlat => 51.766
results_check
end
end
##
# Test the nominatim forward search
def test_search_osm_nominatim
with_http_stubs "nominatim" do
xhr :get, :search_osm_nominatim,
:query => "Hoddesdon", :zoom => 10,
:minlon => -0.559, :minlat => 51.217,
:maxlon => 0.836, :maxlat => 51.766
results_check "name" => "Hoddesdon, Hertfordshire, East of England, England, United Kingdom",
"min-lat" => 51.7216709, "max-lat" => 51.8016709,
"min-lon" => -0.0512898, "max-lon" => 0.0287102,
"type" => "node", "id" => 18007599
xhr :get, :search_osm_nominatim,
:query => "Broxbourne", :zoom => 10,
:minlon => -0.559, :minlat => 51.217,
:maxlon => 0.836, :maxlat => 51.766
results_check({ "prefix" => "Suburb",
"name" => "Broxbourne, Hertfordshire, East of England, England, United Kingdom",
"min-lat" => 51.7265723, "max-lat" => 51.7665723,
"min-lon" => -0.0390782, "max-lon" => 0.0009218,
"type" => "node", "id" => 28825933 },
{ "prefix" => "City Boundary",
"name" => "Broxbourne, Hertfordshire, East of England, England, United Kingdom",
"min-lat" => 51.6808751, "max-lat" => 51.7806237,
"min-lon" => -0.114204, "max-lon" => 0.0145267,
"type" => "relation", "id" => 2677978 },
{ "prefix" => "Railway Station",
"name" => "Broxbourne, Stafford Drive, Broxbourne, Hertfordshire, East of England, England, United Kingdom",
"min-lat" => 51.7418469, "max-lat" => 51.7518469,
"min-lon" => -0.0156773, "max-lon" => -0.0056773,
"type" => "node", "id" => 17044599 })
end
end
##
# Test the geonames forward search
def test_search_geonames
with_http_stubs "geonames" do
xhr :get, :search_geonames,
:query => "Hoddesdon", :zoom => 10,
:minlon => -0.559, :minlat => 51.217,
:maxlon => 0.836, :maxlat => 51.766
results_check :name => "Hoddesdon", :lat => 51.76148, :lon => -0.01144
xhr :get, :search_geonames,
:query => "Broxbourne", :zoom => 10,
:minlon => -0.559, :minlat => 51.217,
:maxlon => 0.836, :maxlat => 51.766
results_check({ :name => "Broxbourne", :lat => 51.74712, :lon => -0.01923 },
{ :name => "Broxbourne District", :lat => 51.73026, :lon => -0.04821 },
{ :name => "Cheshunt", :lat => 51.70791, :lon => -0.03739 },
{ :name => "Hoddesdon", :lat => 51.76148, :lon => -0.01144 },
{ :name => "Waltham Cross", :lat => 51.68905, :lon => -0.0333 },
{ :name => "Goffs Oak", :lat => 51.71015, :lon => -0.0872 },
{ :name => "Wormley", :lat => 51.7324, :lon => -0.0242 },
{ :name => "Broxbourne", :lat => -27.50314, :lon => 151.378 },
{ :name => "Lee Valley White Water Centre", :lat => 51.68814, :lon => -0.01682 },
{ :name => "Cheshunt Railway Station", :lat => 51.703, :lon => -0.024 },
{ :name => "Theobalds Grove Railway Station", :lat => 51.692, :lon => -0.035 },
{ :name => "Waltham Cross Railway Station", :lat => 51.685, :lon => -0.027 },
{ :name => "Rye House Station", :lat => 51.76938, :lon => 0.00562 },
{ :name => "Broxbourne Station", :lat => 51.74697, :lon => -0.01105 },
{ :name => "Broxbornebury Park", :lat => 51.75252, :lon => -0.03839 },
{ :name => "Marriott Cheshunt", :lat => 51.7208, :lon => -0.0324 },
{ :name => "Cheshunt Community Hospital", :lat => 51.68396, :lon => -0.03951 })
end
end
##
# Test the nominatim reverse search
def test_search_osm_nominatim_reverse
with_http_stubs "nominatim" do
xhr :get, :search_osm_nominatim_reverse, :lat => 51.7632, :lon => -0.0076, :zoom => 15
results_check :name => "Broxbourne, Hertfordshire, East of England, England, United Kingdom",
:lat => 51.7465723, :lon => -0.0190782,
:type => "node", :id => 28825933, :zoom => 15
xhr :get, :search_osm_nominatim_reverse, :lat => 51.7632, :lon => -0.0076, :zoom => 17
results_check :name => "Dinant Link Road, Broxbourne, Hertfordshire, East of England, England, EN11 8HX, United Kingdom",
:lat => 51.7634883, :lon => -0.0088373,
:type => "way", :id => 3489841, :zoom => 17
end
end
##
# Test the geonames reverse search
def test_search_geonames_reverse
with_http_stubs "geonames" do
xhr :get, :search_geonames_reverse, :lat => 51.7632, :lon => -0.0076, :zoom => 15
results_check :name => "England", :suffix => ", United Kingdom",
:lat => 51.7632, :lon => -0.0076
end
end
private
def latlon_check(query, lat, lon)
post :search, :query => query
get :search, :query => query
assert_response :success
assert_template "search"
assert_template :search
assert_template :layout => "map"
assert_equal %w(latlon osm_nominatim_reverse), assigns(:sources)
assert_equal %w(latlon osm_nominatim_reverse geonames_reverse), assigns(:sources)
assert_nil @controller.params[:query]
assert_in_delta lat, @controller.params[:lat]
assert_in_delta lon, @controller.params[:lon]
xhr :post, :search, :query => query
xhr :get, :search, :query => query
assert_response :success
assert_template "search"
assert_template :search
assert_template :layout => "xhr"
assert_equal %w(latlon osm_nominatim_reverse), assigns(:sources)
assert_equal %w(latlon osm_nominatim_reverse geonames_reverse), assigns(:sources)
assert_nil @controller.params[:query]
assert_in_delta lat, @controller.params[:lat]
assert_in_delta lon, @controller.params[:lon]
end
def search_check(query, sources)
post :search, :query => query
get :search, :query => query
assert_response :success
assert_template "search"
assert_template :search
assert_template :layout => "map"
assert_equal sources, assigns(:sources)
xhr :post, :search, :query => query
xhr :get, :search, :query => query
assert_response :success
assert_template "search"
assert_template :search
assert_template :layout => "xhr"
assert_equal sources, assigns(:sources)
end
def results_check(*results)
assert_response :success
assert_template :results
assert_template :layout => nil
if results.empty?
assert_select "ul.results-list", 0
else
assert_select "ul.results-list", 1 do
assert_select "p.search_results_entry", results.count
results.each do |result|
attrs = result.collect { |k, v| "[data-#{k}='#{v}']" }.join("")
assert_select "p.search_results_entry a.set_position#{attrs}", result[:name]
end
end
end
end
def results_check_error(error)
assert_response :success
assert_template :error
assert_template :layout => nil
assert_select "p.search_results_error", error
end
end

22
test/controllers/trace_controller_test.rb
View file

@ -728,8 +728,26 @@ class TraceControllerTest < ActionController::TestCase
file.rewind
# Now authenticated, with the legacy public flag
assert_not_equal "private", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
assert_not_equal "public", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
basic_authorization(users(:public_user).display_name, "test")
post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 1
assert_response :success
trace = Trace.find(response.body.to_i)
assert_equal "1.gpx", trace.name
assert_equal "New Trace", trace.description
assert_equal "new, trace", trace.tagstring
assert_equal "public", trace.visibility
assert_equal false, trace.inserted
assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read
trace.destroy
assert_equal "public", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
# Rewind the file
file.rewind
# Now authenticated, with the legacy private flag
assert_nil users(:second_public_user).preferences.where(:k => "gps.trace.visibility").first
basic_authorization(users(:second_public_user).display_name, "test")
post :api_create, :file => file, :description => "New Trace", :tags => "new,trace", :public => 0
assert_response :success
trace = Trace.find(response.body.to_i)
@ -740,7 +758,7 @@ class TraceControllerTest < ActionController::TestCase
assert_equal false, trace.inserted
assert_equal File.new(gpx_files(:public_trace_file).trace_name).read, File.new(trace.trace_name).read
trace.destroy
assert_equal "private", users(:public_user).preferences.where(:k => "gps.trace.visibility").first.v
assert_equal "private", users(:second_public_user).preferences.where(:k => "gps.trace.visibility").first.v
end
# Check updating a trace through the api

48
test/http/geocoder_ca.yml Normal file
View file

@ -0,0 +1,48 @@
/?geoit=XML&postal=A1B+2C3: |
<?xml version="1.0" encoding="UTF-8"?>
<geodata>
<latt>47.172520</latt>
<longt>-55.440515</longt>
<postal>A1B2C3</postal>
<standard>
<stnumber>1</stnumber>
<staddress/>
<city>ST. JOHN&amp;'S</city>
<prov>NL</prov>
<confidence>0.9</confidence>
</standard>
</geodata>
/?geoit=XML&postal=k1a+0b1: |
<?xml version="1.0" encoding="UTF-8"?>
<geodata>
<latt>45.375437</latt>
<longt>-75.691041</longt>
<postal>K1A0B1</postal>
<standard>
<stnumber>1</stnumber>
<staddress/>
<city>OTTAWA</city>
<prov>ON</prov>
<confidence>0.9</confidence>
</standard>
</geodata>
/?geoit=XML&postal=Q0Q+0Q0: |
<?xml version="1.0" encoding="UTF-8"?>
<geodata>
<error>
<code>008</code>
<description>Your request did not produce any results. Check your spelling and try again.</description>
</error>
<latt/>
<longt>-</longt>
<postal>Q0Q0Q0</postal>
<standard>
<stnumber>1</stnumber>
<staddress/>
<city/>
<prov/>
<confidence>0.9</confidence>
</standard>
</geodata>

2
test/http/geocoder_us.yml Normal file
View file

@ -0,0 +1,2 @@
/service/csv?zip=90210: "34.088808, -118.40612, Beverly Hills, CA, 90210"
/service/csv?zip=00000: "1: couldn't find this zip code: 00000! sorry"

222
test/http/geonames.yml Normal file
View file

@ -0,0 +1,222 @@
/search?lang=en&maxRows=20&q=Hoddesdon&username=dummy: |
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<geonames style="MEDIUM">
<totalResultsCount>1</totalResultsCount>
<geoname>
<toponymName>Hoddesdon</toponymName>
<name>Hoddesdon</name>
<lat>51.76148</lat>
<lng>-0.01144</lng>
<geonameId>2646807</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>P</fcl>
<fcode>PPL</fcode>
</geoname>
</geonames>
/search?lang=en&maxRows=20&q=Broxbourne&username=dummy: |
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<geonames style="MEDIUM">
<totalResultsCount>17</totalResultsCount>
<geoname>
<toponymName>Broxbourne</toponymName>
<name>Broxbourne</name>
<lat>51.74712</lat>
<lng>-0.01923</lng>
<geonameId>2654481</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>P</fcl>
<fcode>PPL</fcode>
</geoname>
<geoname>
<toponymName>Broxbourne District</toponymName>
<name>Broxbourne District</name>
<lat>51.73026</lat>
<lng>-0.04821</lng>
<geonameId>7290563</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>A</fcl>
<fcode>ADM3</fcode>
</geoname>
<geoname>
<toponymName>Cheshunt</toponymName>
<name>Cheshunt</name>
<lat>51.70791</lat>
<lng>-0.03739</lng>
<geonameId>2653232</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>P</fcl>
<fcode>PPL</fcode>
</geoname>
<geoname>
<toponymName>Hoddesdon</toponymName>
<name>Hoddesdon</name>
<lat>51.76148</lat>
<lng>-0.01144</lng>
<geonameId>2646807</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>P</fcl>
<fcode>PPL</fcode>
</geoname>
<geoname>
<toponymName>Waltham Cross</toponymName>
<name>Waltham Cross</name>
<lat>51.68905</lat>
<lng>-0.0333</lng>
<geonameId>2634842</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>P</fcl>
<fcode>PPL</fcode>
</geoname>
<geoname>
<toponymName>Goffs Oak</toponymName>
<name>Goffs Oak</name>
<lat>51.71015</lat>
<lng>-0.0872</lng>
<geonameId>2648362</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>P</fcl>
<fcode>PPL</fcode>
</geoname>
<geoname>
<toponymName>Wormley</toponymName>
<name>Wormley</name>
<lat>51.7324</lat>
<lng>-0.0242</lng>
<geonameId>2633535</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>P</fcl>
<fcode>PPL</fcode>
</geoname>
<geoname>
<toponymName>Broxbourne</toponymName>
<name>Broxbourne</name>
<lat>-27.50314</lat>
<lng>151.378</lng>
<geonameId>8792801</geonameId>
<countryCode>AU</countryCode>
<countryName>Australia</countryName>
<fcl>S</fcl>
<fcode>HMSD</fcode>
</geoname>
<geoname>
<toponymName>Lee Valley White Water Centre</toponymName>
<name>Lee Valley White Water Centre</name>
<lat>51.68814</lat>
<lng>-0.01682</lng>
<geonameId>7670551</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>S</fcl>
<fcode>FCL</fcode>
</geoname>
<geoname>
<toponymName>Cheshunt Railway Station</toponymName>
<name>Cheshunt Railway Station</name>
<lat>51.703</lat>
<lng>-0.024</lng>
<geonameId>6952282</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>S</fcl>
<fcode>RSTN</fcode>
</geoname>
<geoname>
<toponymName>Theobalds Grove Railway Station</toponymName>
<name>Theobalds Grove Railway Station</name>
<lat>51.692</lat>
<lng>-0.035</lng>
<geonameId>6953715</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>S</fcl>
<fcode>RSTN</fcode>
</geoname>
<geoname>
<toponymName>Waltham Cross Railway Station</toponymName>
<name>Waltham Cross Railway Station</name>
<lat>51.685</lat>
<lng>-0.027</lng>
<geonameId>6953801</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>S</fcl>
<fcode>RSTN</fcode>
</geoname>
<geoname>
<toponymName>Rye House Station</toponymName>
<name>Rye House Station</name>
<lat>51.76938</lat>
<lng>0.00562</lng>
<geonameId>6691700</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>S</fcl>
<fcode>RSTN</fcode>
</geoname>
<geoname>
<toponymName>Broxbourne Station</toponymName>
<name>Broxbourne Station</name>
<lat>51.74697</lat>
<lng>-0.01105</lng>
<geonameId>6691701</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>S</fcl>
<fcode>RSTN</fcode>
</geoname>
<geoname>
<toponymName>Broxbornebury Park</toponymName>
<name>Broxbornebury Park</name>
<lat>51.75252</lat>
<lng>-0.03839</lng>
<geonameId>6286417</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>S</fcl>
<fcode>CSTL</fcode>
</geoname>
<geoname>
<toponymName>Marriott Cheshunt</toponymName>
<name>Marriott Cheshunt</name>
<lat>51.7208</lat>
<lng>-0.0324</lng>
<geonameId>6512481</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>S</fcl>
<fcode>HTL</fcode>
</geoname>
<geoname>
<toponymName>Cheshunt Community Hospital</toponymName>
<name>Cheshunt Community Hospital</name>
<lat>51.68396</lat>
<lng>-0.03951</lng>
<geonameId>6289233</geonameId>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<fcl>S</fcl>
<fcode>HSP</fcode>
</geoname>
</geonames>
/countrySubdivision?lang=en&lat=51.7632&lng=-0.0076&username=dummy: |
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<geonames>
<countrySubdivision>
<countryCode>GB</countryCode>
<countryName>United Kingdom</countryName>
<adminCode1>ENG</adminCode1>
<adminName1>England</adminName1>
<code type="ISO3166-2">ENG</code>
<distance>0.0</distance>
</countrySubdivision>
</geonames>

45
test/http/nominatim.yml Normal file
View file

@ -0,0 +1,45 @@
/search?accept-language=&format=xml&q=Hoddesdon&viewbox=-0.559%2C51.766%2C0.836%2C51.217: |
<?xml version="1.0" encoding="UTF-8" ?>
<searchresults timestamp='Sun, 01 Mar 15 20:02:29 +0000' attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright' querystring='Hoddesdon' viewbox='-0.559,51.766,0.836,51.217' polygon='false' exclude_place_ids='110741' more_url='http://nominatim.openstreetmap.org/search?format=xml&amp;exclude_place_ids=110741&amp;viewbox=-0.559%2C51.766%2C0.836%2C51.217&amp;q=Hoddesdon'>
<place place_id='110741' osm_type='node' osm_id='18007599' place_rank='18' boundingbox="51.7216709,51.8016709,-0.0512898,0.0287102" lat='51.7616709' lon='-0.0112898' display_name='Hoddesdon, Hertfordshire, East of England, England, United Kingdom' class='place' type='town' importance='0.50547792382382' icon='http://nominatim.openstreetmap.org/images/mapicons/poi_place_town.p.20.png'/>
</searchresults>
/search?accept-language=&format=xml&q=Broxbourne&viewbox=-0.559%2C51.766%2C0.836%2C51.217: |
<?xml version="1.0" encoding="UTF-8" ?>
<searchresults timestamp='Sun, 01 Mar 15 20:42:25 +0000' attribution='Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright' querystring='Broxbourne' viewbox='-0.559,51.766,0.836,51.217' polygon='false' exclude_place_ids='150696,127984131,109724' more_url='http://nominatim.openstreetmap.org/search?format=xml&amp;exclude_place_ids=150696,127984131,109724&amp;viewbox=-0.559%2C51.766%2C0.836%2C51.217&amp;q=Broxbourne'>
<place place_id='150696' osm_type='node' osm_id='28825933' place_rank='20' boundingbox="51.7265723,51.7665723,-0.0390782,0.0009218" lat='51.7465723' lon='-0.0190782' display_name='Broxbourne, Hertfordshire, East of England, England, United Kingdom' class='place' type='suburb' importance='0.52141385408531' icon='http://nominatim.openstreetmap.org/images/mapicons/poi_place_village.p.20.png'/>
<place place_id='127984131' osm_type='relation' osm_id='2677978' place_rank='16' boundingbox="51.6808751,51.7806237,-0.114204,0.0145267" lat='51.73083995' lon='-0.0579457295222991' display_name='Broxbourne, Hertfordshire, East of England, England, United Kingdom' class='boundary' type='administrative' importance='0.46' icon='http://nominatim.openstreetmap.org/images/mapicons/poi_boundary_administrative.p.20.png'/>
<place place_id='109724' osm_type='node' osm_id='17044599' place_rank='30' boundingbox="51.7418469,51.7518469,-0.0156773,-0.0056773" lat='51.7468469' lon='-0.0106773' display_name='Broxbourne, Stafford Drive, Broxbourne, Hertfordshire, East of England, England, United Kingdom' class='railway' type='station' importance='0.111' icon='http://nominatim.openstreetmap.org/images/mapicons/transport_train_station2.p.20.png'/>
</searchresults>
/reverse?accept-language=&lat=51.7632&lon=-0.0076&zoom=15: |
<?xml version="1.0" encoding="UTF-8"?>
<reversegeocode timestamp="Sun, 01 Mar 15 22:49:45 +0000" attribution="Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright" querystring="accept-language=&amp;lat=51.7632&amp;lon=-0.0076&amp;zoom=15">
<result place_id="150696" osm_type="node" osm_id="28825933" ref="Broxbourne" lat="51.7465723" lon="-0.0190782">Broxbourne, Hertfordshire, East of England, England, United Kingdom</result>
<addressparts>
<suburb>Broxbourne</suburb>
<city>Broxbourne</city>
<county>Hertfordshire</county>
<state_district>East of England</state_district>
<state>England</state>
<country>United Kingdom</country>
<country_code>gb</country_code>
</addressparts>
</reversegeocode>
/reverse?accept-language=&lat=51.7632&lon=-0.0076&zoom=17: |
<?xml version="1.0" encoding="UTF-8"?>
<reversegeocode timestamp="Sun, 01 Mar 15 22:58:16 +0000" attribution="Data © OpenStreetMap contributors, ODbL 1.0. http://www.openstreetmap.org/copyright" querystring="accept-language=&amp;lat=51.7632&amp;lon=-0.0076&amp;zoom=17">
<result place_id="46484711" osm_type="way" osm_id="3489841" ref="A1170" lat="51.7634883" lon="-0.0088373">Dinant Link Road, Broxbourne, Hertfordshire, East of England, England, EN11 8HX, United Kingdom</result>
<addressparts>
<road>Dinant Link Road</road>
<suburb>Broxbourne</suburb>
<city>Broxbourne</city>
<county>Hertfordshire</county>
<state_district>East of England</state_district>
<state>England</state>
<postcode>EN11 8HX</postcode>
<country>United Kingdom</country>
<country_code>gb</country_code>
</addressparts>
</reversegeocode>

6
test/http/npemap.yml Normal file
View file

@ -0,0 +1,6 @@
/cgi/geocoder.fcgi?format=text&postcode=CV4+7AL: |
# Easting,Northing,Matched Postcode,Latitude,Longitude
429926,276058,'CV4 7AL',52.381748701968,-1.56176420939232
/cgi/geocoder.fcgi?format=text&postcode=XX9+9XX: |
Error: Postcode area 'XX' not found, postcode probably invalid

32
test/test_helper.rb
View file

@ -117,18 +117,25 @@ module ActiveSupport
assert_equal a.tags, b.tags, "tags on node #{a.id}"
end
##
# set request headers for HTTP basic authentication
def basic_authorization(user, pass)
@request.env["HTTP_AUTHORIZATION"] = format("Basic %s", Base64.encode64("#{user}:#{pass}"))
end
##
# set request readers to ask for a particular error format
def error_format(format)
@request.env["HTTP_X_ERROR_FORMAT"] = format
end
##
# set the raw body to be sent with a POST request
def content(c)
@request.env["RAW_POST_DATA"] = c.to_s
end
##
# Used to check that the error header and the forbidden responses are given
# when the owner of the changset has their data not marked as public
def assert_require_public_data(msg = "Shouldn't be able to use API when the user's data is not public")
@ -136,14 +143,39 @@ module ActiveSupport
assert_equal @response.headers["Error"], "You must make your edits public to upload new data", "Wrong error message"
end
##
# Not sure this is the best response we could give
def assert_inactive_user(msg = "an inactive user shouldn't be able to access the API")
assert_response :unauthorized, msg
# assert_equal @response.headers['Error'], ""
end
##
# Check for missing translations in an HTML response
def assert_no_missing_translations(msg = "")
assert_select "span[class=translation_missing]", false, "Missing translation #{msg}"
end
##
# execute a block with a given set of HTTP responses stubbed
def with_http_stubs(stubs_file)
http_client_save = OSM.http_client
begin
stubs = YAML.load_file(File.expand_path("../http/#{stubs_file}.yml", __FILE__))
OSM.http_client = Faraday.new do |builder|
builder.adapter :test do |stub|
stubs.each do |url, body|
stub.get(url) { |_env| [200, {}, body] }
end
end
end
yield
ensure
OSM.http_client = http_client_save
end
end
end
end