Skip to content
Snippets Groups Projects
Commit 4bb41db8 authored by Rob Murray's avatar Rob Murray
Browse files

return OS GridReference as explicit method rather than part of address

parent 7ce35134
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ module Geocoder::Result ...@@ -15,7 +15,7 @@ module Geocoder::Result
alias_method :postal_code, :blank_result alias_method :postal_code, :blank_result
def address def address
[@data['Location'], @data['OsGrid']].join(', ') @data['Location']
end end
def city def city
...@@ -25,6 +25,10 @@ module Geocoder::Result ...@@ -25,6 +25,10 @@ module Geocoder::Result
city.strip city.strip
end end
def os_grid
@data['OsGrid']
end
# This is a UK only API; all results are UK specific and # This is a UK only API; all results are UK specific and
# so ommitted from API response. # so ommitted from API response.
def country def country
......
...@@ -13,7 +13,8 @@ class PostcodeAnywhereUkTest < GeocoderTestCase ...@@ -13,7 +13,8 @@ class PostcodeAnywhereUkTest < GeocoderTestCase
results = Geocoder.search('Romsey') results = Geocoder.search('Romsey')
assert_equal 1, results.size assert_equal 1, results.size
assert_equal 'Romsey, Hampshire, SU 35270 21182', results.first.address assert_equal 'Romsey, Hampshire', results.first.address
assert_equal 'SU 35270 21182', results.first.os_grid
assert_equal [50.9889, -1.4989], results.first.coordinates assert_equal [50.9889, -1.4989], results.first.coordinates
assert_equal 'Romsey', results.first.city assert_equal 'Romsey', results.first.city
end end
...@@ -22,7 +23,8 @@ class PostcodeAnywhereUkTest < GeocoderTestCase ...@@ -22,7 +23,8 @@ class PostcodeAnywhereUkTest < GeocoderTestCase
results = Geocoder.search('WR26NJ') results = Geocoder.search('WR26NJ')
assert_equal 1, results.size assert_equal 1, results.size
assert_equal 'Moseley Road, Hallow, Worcester, SO 81676 59425', results.first.address assert_equal 'Moseley Road, Hallow, Worcester', results.first.address
assert_equal 'SO 81676 59425', results.first.os_grid
assert_equal [52.2327, -2.2697], results.first.coordinates assert_equal [52.2327, -2.2697], results.first.coordinates
assert_equal 'Hallow', results.first.city assert_equal 'Hallow', results.first.city
end end
...@@ -31,7 +33,8 @@ class PostcodeAnywhereUkTest < GeocoderTestCase ...@@ -31,7 +33,8 @@ class PostcodeAnywhereUkTest < GeocoderTestCase
results = Geocoder.search('hampshire') results = Geocoder.search('hampshire')
assert_equal 1, results.size assert_equal 1, results.size
assert_equal 'Hampshire, SU 48701 26642', results.first.address assert_equal 'Hampshire', results.first.address
assert_equal 'SU 48701 26642', results.first.os_grid
assert_equal [51.037, -1.3068], results.first.coordinates assert_equal [51.037, -1.3068], results.first.coordinates
assert_equal '', results.first.city assert_equal '', results.first.city
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment