Cleanup the Relation.from_xml to come in line with the Way and Node versions. Include...

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 79da2f6e9a2d52bb451e4840557eab0736287bec..f286ab9d3401046e51828e1e8e430e8f58338e22 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -3,19 +3,21 @@ 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
 

-    if query.match(/^\d{5}(-\d{4})?$/)
+    query.sub(/^\s+/, "")
+    query.sub(/\s+$/, "")
+
+    if query.match(/^[+-]?\d+(\.\d*)?\s*[\s,]\s*[+-]?\d+(\.\d*)?$/)
+      results.push search_latlon(query)
+    elsif query.match(/^\d{5}(-\d{4})?$/)

       results.push search_us_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)
+    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)
       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)
+    elsif query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)

       results.push search_ca_postcode(query)
     else
       results.push search_osm_namefinder(query)
       results.push search_ca_postcode(query)
     else
       results.push search_osm_namefinder(query)


@@ -29,7 +31,7 @@ class GeocoderController < ApplicationController
 
       if results_count == 1
         position = results.collect { |s| s[:results] }.compact.flatten[0]
 
       if results_count == 1
         position = results.collect { |s| s[:results] }.compact.flatten[0]

-        page.call "setPosition", position[:lat], position[:lon], position[:zoom]
+        page.call "setPosition", position[:lat].to_f, position[:lon].to_f, position[:zoom].to_i

       else
         page.call "openSidebar"
       end
       else
         page.call "openSidebar"
       end


@@ -55,6 +57,29 @@ class GeocoderController < ApplicationController
 
 private
 
 
 private
 

+  def search_latlon(query)
+    results = Array.new
+
+    # decode the location
+    if m = query.match(/^([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)$/)
+      lat = m[1].to_f
+      lon = m[3].to_f
+    end
+
+    # generate results
+    if lat < -90 or lat > 90
+      return { :source => "Internal", :url => "http://openstreetmap.org/", :error => "Latitude #{lat} out of range" }
+    elsif lon < -180 or lon > 180
+      return { :source => "Internal", :url => "http://openstreetmap.org/", :error => "Longitude #{lon} out of range" }
+    else
+      results.push({:lat => lat, :lon => lon,
+                    :zoom => APP_CONFIG['postcode_zoom'],
+                    :name => "#{lat}, #{lon}"})
+
+      return { :source => "Internal", :url => "http://openstreetmap.org/", :results => results }
+    end
+  end
+

   def search_us_postcode(query)
     results = Array.new
 
   def search_us_postcode(query)
     results = Array.new
 


@@ -64,7 +89,8 @@ private
     # 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 => POSTCODE_ZOOM,
+      results.push({:lat => data[0], :lon => data[1],
+                    :zoom => APP_CONFIG['postcode_zoom'],

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


@@ -85,7 +111,7 @@ private
       dataline = response.split(/\n/)[1]
       data = dataline.split(/,/) # easting,northing,postcode,lat,long
       postcode = data[2].gsub(/'/, "")
       dataline = response.split(/\n/)[1]
       data = dataline.split(/,/) # easting,northing,postcode,lat,long
       postcode = data[2].gsub(/'/, "")

-      zoom = POSTCODE_ZOOM - postcode.count("#")
+      zoom = APP_CONFIG['postcode_zoom'] - postcode.count("#")

       results.push({:lat => data[3], :lon => data[4], :zoom => zoom,
                     :name => postcode})
     end
       results.push({:lat => data[3], :lon => data[4], :zoom => zoom,
                     :name => postcode})
     end


@@ -102,10 +128,10 @@ private
     response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}")
 
     # parse the response
     response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}")
 
     # parse the response

-    unless response.get_elements("geodata/error")
+    if response.get_elements("geodata/error").empty?

       results.push({:lat => response.get_text("geodata/latt").to_s,
                     :lon => response.get_text("geodata/longt").to_s,
       results.push({:lat => response.get_text("geodata/latt").to_s,
                     :lon => response.get_text("geodata/longt").to_s,

-                    :zoom => POSTCODE_ZOOM,
+                    :zoom => APP_CONFIG['postcode_zoom'],

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


@@ -199,7 +225,8 @@ 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 => GEONAMES_ZOOM,
+      results.push({:lat => lat, :lon => lon,
+                    :zoom => APP_CONFIG['geonames_zoom'],

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