Send UK postcode searches to the namefinder as well as npemaps.

[rails.git] / app / controllers / geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 27e7cbf3e7e41db234c311faf57e5a63ac94390a..d997be614b7f02ccef03370b8fab68b4ead1bf80 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -3,6 +3,9 @@ class GeocoderController < ApplicationController
   require 'net/http'
   require 'rexml/document'
 
   require 'net/http'
   require 'rexml/document'
 

+  POSTCODE_ZOOM = 15
+  GEONAMES_ZOOM = 12
+

   def search
     query = params[:query]
     results = Array.new
   def search
     query = params[:query]
     results = Array.new


@@ -11,6 +14,7 @@ class GeocoderController < ApplicationController
       results.push search_us_postcode(query)
     elsif query.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])\s*[0-9][ABD-HJLNP-UW-Z]{2})/i)
       results.push search_uk_postcode(query)
       results.push search_us_postcode(query)
     elsif query.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])\s*[0-9][ABD-HJLNP-UW-Z]{2})/i)
       results.push search_uk_postcode(query)

+      results.push search_osm_namefinder(query)

     elsif query.match(/[A-Z]\d[A-Z]\s*\d[A-Z]\d/i)
       results.push search_ca_postcode(query)
     else
     elsif query.match(/[A-Z]\d[A-Z]\s*\d[A-Z]\d/i)
       results.push search_ca_postcode(query)
     else


@@ -55,12 +59,12 @@ private
     results = Array.new
 
     # ask geocoder.us (they have a non-commercial use api)
     results = Array.new
 
     # ask geocoder.us (they have a non-commercial use api)

-    response = fetch_text("http://rpc.geocoder.us/service/csv?zip=#{URI.escape(query)}")
+    response = fetch_text("http://rpc.geocoder.us/service/csv?zip=#{escape_query(query)}")

 
     # parse the response
     unless response.match(/couldn't find this zip/)
       data = response.split(/\s*,\s+/) # lat,long,town,state,zip
 
     # parse the response
     unless response.match(/couldn't find this zip/)
       data = response.split(/\s*,\s+/) # lat,long,town,state,zip

-      results.push({:lat => data[0], :lon => data[1], :zoom => 12,
+      results.push({:lat => data[0], :lon => data[1], :zoom => POSTCODE_ZOOM,

                     :prefix => "#{data[2]}, #{data[3]}, ",
                     :name => data[4]})
     end
                     :prefix => "#{data[2]}, #{data[3]}, ",
                     :name => data[4]})
     end


@@ -74,13 +78,13 @@ private
     results = Array.new
 
     # ask npemap.org.uk to do a combined npemap + freethepostcode search
     results = Array.new
 
     # ask npemap.org.uk to do a combined npemap + freethepostcode search

-    response = fetch_text("http://www.npemap.org.uk/cgi/geocoder.fcgi?format=text&postcode=#{URI.escape(query)}")
+    response = fetch_text("http://www.npemap.org.uk/cgi/geocoder.fcgi?format=text&postcode=#{escape_query(query)}")

 
     # parse the response
     unless response.match(/Error/)
       dataline = response.split(/\n/)[1]
       data = dataline.split(/,/) # easting,northing,postcode,lat,long
 
     # parse the response
     unless response.match(/Error/)
       dataline = response.split(/\n/)[1]
       data = dataline.split(/,/) # easting,northing,postcode,lat,long

-      results.push({:lat => data[3], :lon => data[4], :zoom => 12,
+      results.push({:lat => data[3], :lon => data[4], :zoom => POSTCODE_ZOOM,

                     :name => data[2].gsub(/'/, "")})
     end
 
                     :name => data[2].gsub(/'/, "")})
     end
 


@@ -93,13 +97,13 @@ private
     results = Array.new
 
     # ask geocoder.ca (note - they have a per-day limit)
     results = Array.new
 
     # ask geocoder.ca (note - they have a per-day limit)

-    response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{URI.escape(query)}")
+    response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}")

 
     # parse the response
     unless response.get_elements("geodata/error")
       results.push({:lat => response.get_text("geodata/latt").to_s,
                     :lon => response.get_text("geodata/longt").to_s,
 
     # parse the response
     unless response.get_elements("geodata/error")
       results.push({:lat => response.get_text("geodata/latt").to_s,
                     :lon => response.get_text("geodata/longt").to_s,

-                    :zoom => 12,
+                    :zoom => POSTCODE_ZOOM,

                     :name => query.upcase})
     end
 
                     :name => query.upcase})
     end
 


@@ -112,7 +116,7 @@ private
     results = Array.new
 
     # ask OSM namefinder
     results = Array.new
 
     # ask OSM namefinder

-    response = fetch_xml("http://www.frankieandshadow.com/osm/search.xml?find=#{URI.escape(query)}")
+    response = fetch_xml("http://www.frankieandshadow.com/osm/search.xml?find=#{escape_query(query)}")

 
     # parse the response
     response.elements.each("searchresults/named") do |named|
 
     # parse the response
     response.elements.each("searchresults/named") do |named|


@@ -151,7 +155,7 @@ private
     results = Array.new
 
     # ask geonames.org
     results = Array.new
 
     # ask geonames.org

-    response = fetch_xml("http://ws.geonames.org/search?q=#{URI.escape(query)}&maxRows=20")
+    response = fetch_xml("http://ws.geonames.org/search?q=#{escape_query(query)}&maxRows=20")

 
     # parse the response
     response.elements.each("geonames/geoname") do |geoname|
 
     # parse the response
     response.elements.each("geonames/geoname") do |geoname|


@@ -159,7 +163,7 @@ private
       lon = geoname.get_text("lng").to_s
       name = geoname.get_text("name").to_s
       country = geoname.get_text("countryName").to_s
       lon = geoname.get_text("lng").to_s
       name = geoname.get_text("name").to_s
       country = geoname.get_text("countryName").to_s

-      results.push({:lat => lat, :lon => lon, :zoom => 12,
+      results.push({:lat => lat, :lon => lon, :zoom => GEONAMES_ZOOM,

                     :name => name,
                     :suffix => ", #{country}"})
     end
                     :name => name,
                     :suffix => ", #{country}"})
     end


@@ -248,4 +252,8 @@ private
 
     return count
   end
 
     return count
   end

+
+  def escape_query(query)
+    return URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]", false, 'N'))
+  end

 end
 end