X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/18d0dde5d167dd4f385a6ba0609eb8ed884dc486..7d6c6622968d670e6a2929afbd8efae41610db2c:/app/controllers/geocoder_controller.rb diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index b04a71cdc..4ce31baf4 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -1,31 +1,41 @@ class GeocoderController < ApplicationController layout 'site' + require 'uri' require 'net/http' require 'rexml/document' def search - res_hash = {} - @postcode_arr = [] - @res_ary = [] + if params[:postcode] and not params[:postcode].empty? + check_postcode(params[:postcode]) + elsif params[:query][:postcode] and not params[:query][:postcode].empty? + check_postcode(params[:query][:postcode]) + elsif params[:query][:place_name] + redirect_to :controller => 'geocoder', :action => 'results', :params => {:place_name => params[:query][:place_name]} + end + end + + def check_postcode(p) - if params[:query][:postcode] - postcode = params[:query][:postcode].upcase - escaped_postcode = postcode.sub(/\s/,'%20') + @postcode_arr = [] + postcode = p.upcase + escaped_postcode = postcode.sub(/\s/,'%20') + begin if postcode.match(/(^\d{5}$)|(^\d{5}-\d{4}$)/) # Its a zip code - ask geocoder.us # (They have a non commerical use api) 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" - return + 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?lat=#{lat}&lon=#{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})/) # It matched our naive UK postcode regexp @@ -36,7 +46,8 @@ class GeocoderController < ApplicationController data = dataline.split(/,/) # easting,northing,postcode,lat,long lat = data[3] lon = data[4] - redirect_to "/index.html?lat=#{lat}&lon=#{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/) # It's a canadian postcode @@ -44,40 +55,80 @@ class GeocoderController < ApplicationController 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>.*?.*?.*?]/)[1] lon = data_lon.split(/[<>]/)[1] - redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14" + redirect_to :controller => params[:next_controller], :action => params[:next_action], :mlat => lat, :mlon => lon, :zoom => 14 + return end - else - # Some other postcode / zip file - redirect_to "/index.html?error=unknown_postcode_or_zip" - end - else - if params[:query][:place_name] != nil or "" - place_name = params[:query][:place_name] + 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}) + /) + #its a UK postcode + begin + Net::HTTP.start('www.freethepostcode.org') do |http| + 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 :controller => params[:next_controller], :action => params[:next_action], :mlat => lat, :mlon => lon, :zoom => 14 + return + end + rescue + redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "invalid_postcode" + #redirect to somewhere else + end + elsif + # Some other postcode / zip code + # Throw it at geonames, and see if they have any luck with it Net::HTTP.start('ws.geonames.org') do |http| - res = http.get("/search?q=#{place_name}&maxRows=10") - xml = REXML::Document.new(res.body) - xml.elements.each("geonames/geoname") do |ele| - res_hash = {} - ele.elements.each("name"){ |n| res_hash['name'] = n.text } - ele.elements.each("countryCode"){ |n| res_hash['country_code'] = n.text } - ele.elements.each("countryNode"){ |n| res_hash['country_name'] = n.text } - ele.elements.each("lat"){ |n| res_hash['lat'] = n.text } - ele.elements.each("lng"){ |n| res_hash['lon']= n.text } - @res_ary << res_hash - end + resp = http.get("/postalCodeSearch?postalcode=#{escaped_postcode}&maxRows=1") + hits = resp.body.slice(/totalResultsCount>.*?]/)[1] + if hits == "0" + # Geonames doesn't know, it's probably wrong + redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "invalid_postcode_or_zip" + return + end + data_lat = resp.body.slice(/lat>.*?.*?]/)[1] + lon = data_lon.split(/[<>]/)[1] + 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 :controller => params[:next_controller], :action => params[:next_action], :error => "invalid_postcode_or_zip" + return end - redirect_to :controller => 'geocoder', :action => 'results', :params => @res_ary + rescue + #Its likely that an api is down + redirect_to :controller => params[:next_controller], :action => params[:next_action], :error => "api_down" end end - def result - @res = :params[@res_ary] + def results + @place_name = params[:place_name] + res_hash = {} + @res_ary = [] + begin + Net::HTTP.start('ws.geonames.org') do |http| + res = http.get("/search?q=#{URI.escape(@place_name)}&maxRows=10") + xml = REXML::Document.new(res.body) + xml.elements.each("geonames/geoname") do |ele| + res_hash = {} + ele.elements.each("name"){ |n| res_hash['name'] = n.text } + ele.elements.each("countryCode"){ |n| res_hash['countrycode'] = n.text } + ele.elements.each("countryName"){ |n| res_hash['countryname'] = n.text } + ele.elements.each("lat"){ |n| res_hash['lat'] = n.text } + ele.elements.each("lng"){ |n| res_hash['lon']= n.text } + @res_ary << res_hash + end + end + + flash.delete(:notice) + rescue Timeout::Error + flash[:notice] = "Timed out waiting for results from ws.geonames.org" + rescue Exception => ex + flash[:notice] = "Error contacting ws.geonames.org: #{ex.to_s}" + end end end