From: Tom Hughes <tom@compton.nu>
Date: Wed, 11 Nov 2009 14:22:21 +0000 (+0000)
Subject: Make nominatim live.
X-Git-Tag: live~6455
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c6eb4d58569d84d5181eb3dbe58f4da95b9e176a?ds=sidebyside

Make nominatim live.
---

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index c84571407..df051f09d 100644
--- 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
@@ -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 })
diff --git a/config/application.yml b/config/application.yml
index fce78a364..d4a8537e8 100644
--- a/config/application.yml
+++ b/config/application.yml
@@ -11,8 +11,6 @@ standard_settings: &standard_settings
   postcode_zoom: 15
   # Zoom level to use for geonames results from the geocoder
   geonames_zoom: 12
-  # Enable experimental nominatim geocoder
-  nominatim_enabled: false
   # Timeout for API calls in seconds
   api_timeout: 300
   # Periods (in hours) which are allowed for user blocks