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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 556cfb36ad4ae53bf04fbadd3097cbdc9bb31dbd..66c2ae41788387b6871e5618de3c5403ba68503d 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -20,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
 
@@ -213,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]

diff --git a/config/application.yml b/config/application.yml
index 6a67a51236af20f3c1a9fe234513a54553e360fb..c14dc8168848062b53a88584c43cf3befaa50f18 100644 (file)
--- a/config/application.yml
+++ b/config/application.yml
@@ -11,6 +11,8 @@ standard_settings: &standard_settings
   postcode_zoom: 15
   # Zoom level to use for geonames results from the geocoder
   geonames_zoom: 12
+  # Enable experimental "twain" geocoder
+  twain_enabled: false
   # Timeout for API calls in seconds
   api_timeout: 300
   # Periods (in hours) which are allowed for user blocks

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f7fe4133abba9ef7921c5cd1d4510f4efc37ea05..270549b651f53da1cb4398f205e666bc40c3286f 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -371,12 +371,16 @@ en:
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_namefinder: 'Results from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
+        osm_twain: 'Results from <a href="http://katie.openstreetmap.org/~twain/">OpenStreetMap Twain</a>'
         geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
     search_osm_namefinder:
       prefix: "{{type}}"
       suffix_place: ", {{distance}} {{direction}} of {{placename}}"
       suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})"
       suffix_suburb: "{{suffix}}, {{parentname}}"
+    search_osm_twain:
+      prefix_highway: "{{type}} road"
+      prefix_other: "{{type}}"
     description:
       title:
         osm_namefinder: '{{types}} from <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'

diff --git a/config/routes.rb b/config/routes.rb
index f2f27427a5ea83ede3de839ddc2b01e668e5ebbd..a466c0a7197ba62cb5242f8fd759c9071a85fcaf 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -180,6 +180,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/geocoder/search_uk_postcode', :controller => 'geocoder', :action => 'search_uk_postcode'
   map.connect '/geocoder/search_ca_postcode', :controller => 'geocoder', :action => 'search_ca_postcode'
   map.connect '/geocoder/search_osm_namefinder', :controller => 'geocoder', :action => 'search_osm_namefinder'
+  map.connect '/geocoder/search_osm_twain', :controller => 'geocoder', :action => 'search_osm_twain'
   map.connect '/geocoder/search_geonames', :controller => 'geocoder', :action => 'search_geonames'
   map.connect '/geocoder/description', :controller => 'geocoder', :action => 'description'
   map.connect '/geocoder/description_osm_namefinder', :controller => 'geocoder', :action => 'description_osm_namefinder'