X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/529279d2278d9fedb1772146fb52e15ac8216d0a..738cf50d088a3adb556e72e61c1a9ed5f87daa12:/app/controllers/geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 99042414d..8ef43ec6d 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -4,25 +4,68 @@ class GeocoderController < ApplicationController
   require 'net/http'
   require 'rexml/document'
 
-  before_filter :authorize_web
-  before_filter :require_user
-
   def search
     res_hash = {}
     @postcode_arr = []
     @res_ary = []
 
-    if params[:query][:postcode] != "" 
-      postcode = params[:query][:postcode]
+    if params[:query][:postcode] 
+      postcode = params[:query][:postcode].upcase
+      escaped_postcode = postcode.sub(/\s/,'%20')
+
       if postcode.match(/(^\d{5}$)|(^\d{5}-\d{4}$)/)
-        #its a zip code - do something
+        # 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
+          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(/^([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|
+          resp = http.get("/cgi/geocoder.fcgi?format=text&postcode=#{escaped_postcode}")
+          dataline = resp.body.split(/\n/)[1]
+          data = dataline.split(/,/) # easting,northing,postcode,lat,long
+          lat = data[3] 
+          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}")
+          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
-        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]+/)
-          @postcode_array = [lat, lon]
-          redirect_to "/index.html?lat=#{@postcode_array[0]}&lon=#{@postcode_array[1]}&zoom=14"
+        # 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|
+          resp = http.get("/postalCodeSearch?postalcode=#{escaped_postcode}&maxRows=1")
+          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"
+             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?lat=#{lat}&lon=#{lon}&zoom=14"
         end
       end
     else
@@ -42,11 +85,11 @@ class GeocoderController < ApplicationController
           end 
         end
       end
-      redirect_to :controller => 'geocoder', :action => 'results'
+      redirect_to :controller => 'geocoder', :action => 'results', :params => @res_ary
     end
   end
 
   def result
-
+    @res = :params[@res_ary]
   end
 end