Localisation updates from translatewiki.net (2009-11-17)

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

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index fdde8285222e614c2f1dab51030fcf9c9c5b9307..eed63c7a44fd5de3ab2ba1c9340ff6b0549bc921 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -19,12 +19,12 @@ 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_nominatim"
       @sources.push "osm_namefinder"
     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_nominatim"
       @sources.push "osm_namefinder"
       @sources.push "geonames"
     end
@@ -232,18 +232,18 @@ class GeocoderController < ApplicationController
     @results = Array.new
 
     # ask nominatim
-    response = fetch_xml("http://nominatim.openstreetmap.org/search?format=xml&q=#{escape_query(query)}#{viewbox}")
+    response = fetch_xml("http://nominatim.openstreetmap.org/search?format=xml&q=#{escape_query(query)}#{viewbox}&accept-language=#{request.user_preferred_languages.join(',')}")
 
     # parse the response
     response.elements.each("searchresults/place") do |place|
       lat = place.attributes["lat"].to_s
       lon = place.attributes["lon"].to_s
       klass = place.attributes["class"].to_s
-      type = place.attributes["type"].to_s
+      type = place.attributes["type"].to_s.gsub("_", " ")
       name = place.attributes["display_name"].to_s
       min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",")
 
-      if klass == "highway"
+      if klass == "highway" and ["trunk","primary","secondary","tertiary","unclassified","residential"].include?(type)
         prefix = t 'geocoder.search_osm_nominatim.prefix_highway', :type => type.capitalize
       else
         prefix = t 'geocoder.search_osm_nominatim.prefix_other', :type => type.capitalize
@@ -292,7 +292,7 @@ class GeocoderController < ApplicationController
   def description
     @sources = Array.new
 
-    @sources.push({ :name => "osm_nominatim" }) if APP_CONFIG['nominatim_enabled']
+    @sources.push({ :name => "osm_nominatim" })
     @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 })
@@ -350,7 +350,7 @@ class GeocoderController < ApplicationController
     @results = Array.new
 
     # ask OSM namefinder
-    response = fetch_xml("http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}")
+    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") do |result|