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

Add Canadian geocoding, and attribute the geocoders we use

Browse source
This commit is contained in:
Nick Burch 2007-04-24 10:32:34 +00:00
parent 4c8e1fa545
commit 18d0dde5d1
3 changed files with 38 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/controllers/geocoder_controller.rb
View file

@ -10,7 +10,7 @@ class GeocoderController < ApplicationController
@res_ary = [] @res_ary = []
if params[:query][:postcode] if params[:query][:postcode]
postcode = params[:query][:postcode] postcode = params[:query][:postcode].upcase
escaped_postcode = postcode.sub(/\s/,'%20') escaped_postcode = postcode.sub(/\s/,'%20')
if postcode.match(/(^\d{5}$)|(^\d{5}-\d{4}$)/) if postcode.match(/(^\d{5}$)|(^\d{5}-\d{4}$)/)
@ -18,12 +18,16 @@ class GeocoderController < ApplicationController
# (They have a non commerical use api) # (They have a non commerical use api)
Net::HTTP.start('rpc.geocoder.us') do |http| Net::HTTP.start('rpc.geocoder.us') do |http|
resp = http.get("/service/csv?zip=#{postcode}") resp = http.get("/service/csv?zip=#{postcode}")
if resp.body.match(/couldn't find this zip/)
redirect_to "/index.html?error=invalid_zip_code"
return
end
data = resp.body.split(/, /) # lat,long,town,state,zip data = resp.body.split(/, /) # lat,long,town,state,zip
lat = data[0] lat = data[0]
lon = data[1] lon = data[1]
redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14" redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
end end
elsif postcode.match(/^(\w{1,2}\d+\w?\s*\d\w\w)/) elsif postcode.match(/^([A-Z]{1,2}\d+[A-Z]?\s*\d[A-Z]{2})/)
# It matched our naive UK postcode regexp # It matched our naive UK postcode regexp
# Ask npemap to do a combined npemap + freethepostcode search # Ask npemap to do a combined npemap + freethepostcode search
Net::HTTP.start('www.npemap.org.uk') do |http| Net::HTTP.start('www.npemap.org.uk') do |http|
@ -34,6 +38,20 @@ class GeocoderController < ApplicationController
lon = data[4] lon = data[4]
redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14" redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
end end
elsif postcode.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d/)
# It's a canadian postcode
# Ask geocoder.ca (note - they have a per-day limit)
postcode = postcode.sub(/\s/,'')
Net::HTTP.start('geocoder.ca') do |http|
resp = http.get("?geoit=XML&postal=#{postcode}")
$stderr.print resp.body
$stderr.print resp.body.slice(/latt>.*?</)
data_lat = resp.body.slice(/latt>.*?</)
data_lon = resp.body.slice(/longt>.*?</)
lat = data_lat.split(/[<>]/)[1]
lon = data_lon.split(/[<>]/)[1]
redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
end
else else
# Some other postcode / zip file # Some other postcode / zip file
redirect_to "/index.html?error=unknown_postcode_or_zip" redirect_to "/index.html?error=unknown_postcode_or_zip"

8
app/views/site/index.rhtml
View file

@ -6,8 +6,14 @@
<%= text_field 'query', 'place_name'%> <%= text_field 'query', 'place_name'%>
<%= submit_tag 'Search' %> <%= submit_tag 'Search' %>
<%= end_form_tag %> <%= end_form_tag %>
<div id="geocoder-attribution">
Geolocation provided by <a href="http://npemap.org.uk/">npemap.org.uk</a>,
<a href="http://geocoder.us/">geocoder.us</a>, <a href="http://geocoder.ca/">geocoder.ca</a>
and <a href="http://www.geonames.org/">geonames.org</a>
</div>
<div id="postcode-helper"> <div id="postcode-helper">
eg: SW15 6JH eg: SW15 6JH, 95472 or H2L4C1
</div> </div>
<div id="placename-helper"> <div id="placename-helper">
eg:Essen eg:Essen

13
public/stylesheets/site.css
View file

@ -289,17 +289,26 @@ hides rule from IE5-Mac \*/
font-size: 12px; font-size: 12px;
padding-top: 5px; padding-top: 5px;
padding-left: 14px; padding-left: 14px;
padding-bottom: 15px;
width: 700px;
} }
#placename-helper{ #placename-helper{
font-size: 9px; font-size: 9px;
position:relative; bottom:36px; left: 470px; position:absolute; top:20px; left: 250px;
color: gray; color: gray;
} }
#postcode-helper{ #postcode-helper{
font-size: 9px; font-size: 9px;
position:relative; bottom:17px; left: 180px; position:absolute; top:20px; left: 20px;
color: gray;
}
#geocoder-attribution{
font-size: 9px;
position:absolute; top:26px; left: 450px;
line-height: 8px;
color: gray; color: gray;
} }