X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/17e07539629ee8a1fdb5bebbb4c287720905066e..639a994c9b851b94d4c65aa96af732eefc8453fb:/app/controllers/geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 9f90980bf..f92e370c0 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -287,6 +287,7 @@ class GeocoderController < ApplicationController
     @sources.push({ :name => "osm_namefinder", :types => "cities", :max => 2 })
     @sources.push({ :name => "osm_namefinder", :types => "towns", :max => 4 })
     @sources.push({ :name => "osm_namefinder", :types => "places", :max => 10 })
+    @sources.push({ :name => "osm_twain" }) if APP_CONFIG['twain_enabled']
     @sources.push({ :name => "geonames" })
 
     render :update do |page|
@@ -331,6 +332,31 @@ class GeocoderController < ApplicationController
     render :action => "error"
   end
 
+  def description_osm_twain
+    # get query parameters
+    lat = params[:lat]
+    lon = params[:lon]
+    zoom = params[:zoom]
+
+    # create result array
+    @results = Array.new
+
+    # ask OSM namefinder
+    response = fetch_xml("http://katie.openstreetmap.org/~twain/reverse.php?lat=#{lat}&lon=#{lon}&zoom=#{zoom}")
+
+    # parse the response
+    response.elements.each("reversegeocode") do |result|
+      description = result.get_text("result").to_s
+
+      @results.push({:prefix => "#{description}"})
+    end
+
+    render :action => "results"
+  rescue Exception => ex
+    @error = "Error contacting katie.openstreetmap.org: #{ex.to_s}"
+    render :action => "error"
+  end
+
   def description_geonames
     # get query parameters
     lat = params[:lat]