Add experimental support (disabled by default) for new geocoder.

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 8fceef376ad52f1646e53993ef09dfbe40bfb713..66c2ae41788387b6871e5618de3c5403ba68503d 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -3,6 +3,7 @@ class GeocoderController < ApplicationController
   require 'net/http'
   require 'rexml/document'
 
+  before_filter :authorize_web
   before_filter :set_locale
 
   def search
@@ -19,10 +20,12 @@ class GeocoderController < ApplicationController
     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)
       @sources.push "uk_postcode"
       @sources.push "osm_namefinder"
+      @sources.push "osm_twain" if APP_CONFIG['twain_enabled']
     elsif @query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)
       @sources.push "ca_postcode"
     else
       @sources.push "osm_namefinder"
+      @sources.push "osm_twain" if APP_CONFIG['twain_enabled']
       @sources.push "geonames"
     end
 
@@ -76,7 +79,7 @@ class GeocoderController < ApplicationController
       data = response.split(/\s*,\s+/) # lat,long,town,state,zip
       @results.push({:lat => data[0], :lon => data[1],
                      :zoom => APP_CONFIG['postcode_zoom'],
-                     :prefix => "#{data[2]}, #{data[3]}, ",
+                     :prefix => "#{data[2]}, #{data[3]},",
                      :name => data[4]})
     end
 
@@ -212,6 +215,41 @@ class GeocoderController < ApplicationController
     render :action => "error"
   end
 
+  def search_osm_twain
+    # get query parameters
+    query = params[:query]
+
+    # create result array
+    @results = Array.new
+
+    # ask OSM namefinder
+    response = fetch_xml("http://katie.openstreetmap.org/~twain/?format=xml&q=#{escape_query(query)}")
+
+    # parse the response
+    response.elements.each("searchresults/place") do |place|
+      lat = place.attributes["lat"].to_s
+      lon = place.attributes["lon"].to_s
+      zoom = place.attributes["zoom"].to_s
+      klass = place.attributes["class"].to_s
+      type = place.attributes["type"].to_s
+      name = place.attributes["display_name"].to_s
+
+      if klass == "highway"
+        prefix = t 'geocoder.search_osm_twain.prefix_highway', :type => type.capitalize
+      else
+        prefix = t 'geocoder.search_osm_twain.prefix_other', :type => type.capitalize
+      end
+
+      @results.push({:lat => lat, :lon => lon, :zoom => zoom,
+                     :prefix => prefix, :name => name})
+    end
+
+    render :action => "results"
+  rescue Exception => ex
+    @error = "Error contacting katie.openstreetmap.org: #{ex.to_s}"
+    render :action => "error"
+  end
+
   def search_geonames
     # get query parameters
     query = params[:query]
@@ -278,7 +316,7 @@ class GeocoderController < ApplicationController
       description = named.elements["description"].to_s
       distance = format_distance(place.attributes["approxdistance"].to_i)
       direction = format_direction((place.attributes["direction"].to_i - 180) % 360)
-      prefix = t "geocoder.description.osm_namefinder_prefix", :distance => distance, :direction => direction, :type => type
+      prefix = t "geocoder.description_osm_namefinder.prefix", :distance => distance, :direction => direction, :type => type
       @results.push({:lat => lat, :lon => lon, :zoom => zoom,
                      :prefix => prefix.capitalize, :name => name,
                      :description => description})