From: Tom Hughes <tom@compton.nu>
Date: Tue, 2 Nov 2010 10:40:43 +0000 (+0000)
Subject: Allow the Nominatim instance used to be configured
X-Git-Tag: live~6282^2~48
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f364dd8f005aaed40d6a6687bd22c034cfd9e3a3?hp=1910dda7329ab8b0859150165acc7ad6dfb5732a

Allow the Nominatim instance used to be configured
---

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index d07b74f11..29e7648af 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -234,7 +234,7 @@ class GeocoderController < ApplicationController
     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(',')}")
+    response = fetch_xml("#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{request.user_preferred_languages.join(',')}")
 
     # create result array
     @results = Array.new
@@ -355,7 +355,7 @@ class GeocoderController < ApplicationController
     @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(',')}")
+    response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{request.user_preferred_languages.join(',')}")
 
     # parse the response
     response.elements.each("reversegeocode/result") do |result|
diff --git a/config/example.application.yml b/config/example.application.yml
index 9b00beb58..ab5c9a846 100644
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -55,6 +55,8 @@ standard_settings: &standard_settings
   #file_column_root: ""
   # Enable legacy OAuth 1.0 support
   oauth_10_support: true
+  # URL of Nominatim instance to use for geocoding
+  nominatim_url: "http://nominatim.openstreetmap.org/"
 
 development:
   <<: *standard_settings