X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0166abe88a2c082500f208d6f6be1343e6d0bedd..7dd06b4f88ff97c6942210b89cea9f96a39feaca:/app/controllers/geocoder_controller.rb

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 9f90980bf..9706001cd 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -19,13 +19,13 @@ class GeocoderController < ApplicationController
       @sources.push "us_postcode"
     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_nominatim" if APP_CONFIG['nominatim_enabled']
       @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_nominatim" if APP_CONFIG['nominatim_enabled']
       @sources.push "osm_namefinder"
-      @sources.push "osm_twain" if APP_CONFIG['twain_enabled']
       @sources.push "geonames"
     end
 
@@ -215,7 +215,7 @@ class GeocoderController < ApplicationController
     render :action => "error"
   end
 
-  def search_osm_twain
+  def search_osm_nominatim
     # get query parameters
     query = params[:query]
 
@@ -223,25 +223,24 @@ class GeocoderController < ApplicationController
     @results = Array.new
 
     # ask OSM namefinder
-    response = fetch_xml("http://katie.openstreetmap.org/~twain/?format=xml&polygon=true&q=#{escape_query(query)}")
+    response = fetch_xml("http://nominatim.openstreetmap.org/search?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
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")
 
       if klass == "highway"
-        prefix = t 'geocoder.search_osm_twain.prefix_highway', :type => type.capitalize
+        prefix = t 'geocoder.search_osm_nominatim.prefix_highway', :type => type.capitalize
       else
-        prefix = t 'geocoder.search_osm_twain.prefix_other', :type => type.capitalize
+        prefix = t 'geocoder.search_osm_nominatim.prefix_other', :type => type.capitalize
       end
 
-      @results.push({:lat => lat, :lon => lon, :zoom => zoom,
+      @results.push({:lat => lat, :lon => lon,
                      :min_lat => min_lat, :max_lat => max_lat,
                      :min_lon => min_lon, :max_lon => max_lon,
                      :prefix => prefix, :name => name})
@@ -249,7 +248,7 @@ class GeocoderController < ApplicationController
 
     render :action => "results"
   rescue Exception => ex
-    @error = "Error contacting katie.openstreetmap.org: #{ex.to_s}"
+    @error = "Error contacting nominatim.openstreetmap.org: #{ex.to_s}"
     render :action => "error"
   end
 
@@ -284,6 +283,7 @@ class GeocoderController < ApplicationController
   def description
     @sources = Array.new
 
+    @sources.push({ :name => "osm_nominatim" }) if APP_CONFIG['nominatim_enabled']
     @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 })
@@ -331,6 +331,31 @@ class GeocoderController < ApplicationController
     render :action => "error"
   end
 
+  def description_osm_nominatim
+    # 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://nominatim.openstreetmap.org/reverse?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 nominatim.openstreetmap.org: #{ex.to_s}"
+    render :action => "error"
+  end
+
   def description_geonames
     # get query parameters
     lat = params[:lat]