From 1a2f6c29c6d1d0fa7b2d23715dde78936c3bc8e5 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 18 Apr 2012 18:44:37 +0100
Subject: [PATCH] Update to use api.geonames.org instead of ws.geonames.org

---
 app/controllers/geocoder_controller.rb | 4 ++--
 config/example.application.yml         | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index c55c85833..2b03790aa 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -26,7 +26,7 @@ class GeocoderController < ApplicationController
       @sources.push "osm_nominatim"
     else
       @sources.push "osm_nominatim"
-      @sources.push "geonames"
+      @sources.push "geonames" if defined?(GEONAMES_USERNAME)
     end
   end
 
@@ -272,7 +272,7 @@ class GeocoderController < ApplicationController
     @results = Array.new
 
     # ask geonames.org
-    response = fetch_xml("http://ws.geonames.org/search?q=#{escape_query(query)}&maxRows=20")
+    response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&maxRows=20&username=#{GEONAMES_USERNAME}")
 
     # parse the response
     response.elements.each("geonames/geoname") do |geoname|
diff --git a/config/example.application.yml b/config/example.application.yml
index 420278a1f..cf18ab557 100644
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -38,6 +38,8 @@ defaults: &defaults
   max_messages_per_hour: 60
   # Domain for handling message replies
   #messages_domain: "messages.openstreetmap.org"
+  # Geonames authentication details
+  #geonames_username: ""
   # Quova authentication details
   #quova_username: ""
   #quova_password: ""
-- 
2.43.2