X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4c8e1fa545b9fd7196a8a6cd4b3cb1708e1c4dcc..18d0dde5d167dd4f385a6ba0609eb8ed884dc486:/app/controllers/geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 22b1a8b3f..b04a71cdc 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -10,7 +10,7 @@ class GeocoderController < ApplicationController
     @res_ary = []
 
     if params[:query][:postcode] 
-      postcode = params[:query][:postcode]
+      postcode = params[:query][:postcode].upcase
       escaped_postcode = postcode.sub(/\s/,'%20')
 
       if postcode.match(/(^\d{5}$)|(^\d{5}-\d{4}$)/)
@@ -18,12 +18,16 @@ class GeocoderController < ApplicationController
         # (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
+          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"
         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
         # Ask npemap to do a combined npemap + freethepostcode search
         Net::HTTP.start('www.npemap.org.uk') do |http|
@@ -34,6 +38,20 @@ class GeocoderController < ApplicationController
           lon = data[4]
           redirect_to "/index.html?lat=#{lat}&lon=#{lon}&zoom=14"
         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
         # Some other postcode / zip file
         redirect_to "/index.html?error=unknown_postcode_or_zip"