We can cache the trace list for logged in users now

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 66c2ae41788387b6871e5618de3c5403ba68503d..2af95e5fafc83e8a961e08a216af915fd8ffbdb7 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -17,15 +17,15 @@ class GeocoderController < ApplicationController
       @sources.push "latlon"
     elsif @query.match(/^\d{5}(-\d{4})?$/)
       @sources.push "us_postcode"
+      @sources.push "osm_nominatim"
     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']
+      @sources.push "osm_nominatim"
     elsif @query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i)
       @sources.push "ca_postcode"
+      @sources.push "osm_nominatim"
     else
-      @sources.push "osm_namefinder"
-      @sources.push "osm_twain" if APP_CONFIG['twain_enabled']
+      @sources.push "osm_nominatim"
       @sources.push "geonames"
     end
 
@@ -215,38 +215,57 @@ class GeocoderController < ApplicationController
     render :action => "error"
   end
 
-  def search_osm_twain
+  def search_osm_nominatim
     # get query parameters
     query = params[:query]
+    minlon = params[:minlon]
+    minlat = params[:minlat]
+    maxlon = params[:maxlon]
+    maxlat = params[:maxlat]
+
+    # get view box
+    if minlon && minlat && maxlon && maxlat
+      viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}"
+    end
+
+    # get objects to excude
+    if params[:exclude]
+      exclude = "&exclude_place_ids=#{params[:exclude].join(',')}"
+    end
+
+    # ask nominatim
+    response = fetch_xml("http://nominatim.openstreetmap.org/search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}")
 
     # create result array
     @results = Array.new
 
-    # ask OSM namefinder
-    response = fetch_xml("http://katie.openstreetmap.org/~twain/?format=xml&q=#{escape_query(query)}")
+    # create parameter hash for "more results" link
+    @more_params = params.reverse_merge({ :exclude => [] })
+
+    # extract the results from the response
+    results =  response.elements["searchresults"]
 
     # parse the response
-    response.elements.each("searchresults/place") do |place|
+    results.elements.each("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(",")
+      prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize
+      prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name
 
-      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,
+      @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})
+      @more_params[:exclude].push(place.attributes["place_id"].to_s)
     end
 
     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
 
@@ -277,13 +296,11 @@ class GeocoderController < ApplicationController
     @error = "Error contacting ws.geonames.org: #{ex.to_s}"
     render :action => "error"
   end
-  
+
   def description
     @sources = Array.new
 
-    @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_nominatim" })
     @sources.push({ :name => "geonames" })
 
     render :update do |page|
@@ -328,6 +345,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}&accept-language=#{request.user_preferred_languages.join(',')}")
+
+    # parse the response
+    response.elements.each("reversegeocode/result") do |result|
+      description = result.get_text.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]