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

Add the search boxes to the edit page.

Browse source
This commit is contained in:
Tom Hughes 2007-06-12 16:51:12 +00:00
parent c99992f85f
commit f7f2b7482d
5 changed files with 53 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/controllers/geocoder_controller.rb
View file

@ -39,13 +39,13 @@ class GeocoderController < ApplicationController
Net::HTTP.start('rpc.geocoder.us') do |http|
resp = http.get("/service/csv?zip=#{postcode}")
if resp.body.match(/couldn't find this zip/)
redirect_to "/index.html?error=invalid_zip_code"
redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "invalid_zip_code"
return
end
data = resp.body.split(/, /) # lat,long,town,state,zip
lat = data[0]
lon = data[1]
redirect_to "/index.html?mlat=#{lat}&mlon=#{lon}&zoom=14"
redirect_to :controller => params[:next_controller], :action => params[:next_action], :mlat => lat, :mlon => lon, :zoom => 14
return
end
elsif postcode.match(/^([A-Z]{1,2}\d+[A-Z]?\s*\d[A-Z]{2})/)
@ -57,7 +57,7 @@ class GeocoderController < ApplicationController
data = dataline.split(/,/) # easting,northing,postcode,lat,long
lat = data[3]
lon = data[4]
redirect_to "/index.html?mlat=#{lat}&mlon=#{lon}&zoom=14"
redirect_to :controller => params[:next_controller], :action => params[:next_action], :mlat => lat, :mlon => lon, :zoom => 14
return
end
elsif postcode.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d/)
@ -70,7 +70,7 @@ class GeocoderController < ApplicationController
data_lon = resp.body.slice(/longt>.*?</)
lat = data_lat.split(/[<>]/)[1]
lon = data_lon.split(/[<>]/)[1]
redirect_to "/index.html?mlat=#{lat}&mlon=#{lon}&zoom=14"
redirect_to :controller => params[:next_controller], :action => params[:next_action], :mlat => lat, :mlon => lon, :zoom => 14
return
end
elsif postcode.match(/(GIR 0AA|[A-PR-UWYZ]([0-9]{1,2}|([A-HK-Y][0-9]|[A-HK-Y][0-9]([0-9]|[ABEHMNPRV-Y]))|[0-9][A-HJKS-UW]) [0-9][ABD-HJLNP-UW-Z]{2})
@ -81,15 +81,13 @@ class GeocoderController < ApplicationController
resp = http.get("/geocode?postcode=#{postcode}")
lat = resp.body.scan(/[4-6][0-9]\.?[0-9]+/)
lon = resp.body.scan(/[-+][0-9]\.?[0-9]+/)
redirect_to "/index.html?mlat=#{lat}&mlon=#{lon}&zoom=14"
redirect_to :controller => params[:next_controller], :action => params[:next_action], :mlat => lat, :mlon => lon, :zoom => 14
return
end
rescue
redirect_to "/index.html"
redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "invalid_postcode"
#redirect to somewhere else
end
redirect_to "/index.html?mlat=#{lat}&mlon=#{lon}&zoom=14"
#redirect_to "/index.html?error=unknown_postcode_or_zip"
elsif
# Some other postcode / zip code
# Throw it at geonames, and see if they have any luck with it
@ -98,23 +96,23 @@ class GeocoderController < ApplicationController
hits = resp.body.slice(/totalResultsCount>.*?</).split(/[<>]/)[1]
if hits == "0"
# Geonames doesn't know, it's probably wrong
redirect_to "/index.html?error=unknown_postcode_or_zip"
redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "invalid_postcode_or_zip"
return
end
data_lat = resp.body.slice(/lat>.*?</)
data_lon = resp.body.slice(/lng>.*?</)
lat = data_lat.split(/[<>]/)[1]
lon = data_lon.split(/[<>]/)[1]
redirect_to "/index.html?mlat=#{lat}&mlon=#{lon}&zoom=14"
redirect_to :controller => params[:next_controller], :action => params[:next_action], :mlat => lat, :mlon => lon, :zoom => 14
end
else
# Some other postcode / zip file
redirect_to "/index.html?error=unknown_postcode_or_zip"
redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "invalid_postcode_or_zip"
return
end
rescue
#Its likely that an api is down
redirect_to "/index.html?error=api_dpwn"
redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "api_down"
end
end