From: Tom Hughes <tom@compton.nu>
Date: Fri, 24 Aug 2007 22:50:34 +0000 (+0000)
Subject: Include a general location from GeoNames in the reverse geocode description.
X-Git-Tag: live~8160
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e376f3c00980a8026445c21d653fa5119f23a72a

Include a general location from GeoNames in the reverse geocode description.
---

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 6c4afeb90..4ed94b649 100644
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -41,6 +41,7 @@ class GeocoderController < ApplicationController
     results.push description_osm_namefinder("cities", lat, lon, 2)
     results.push description_osm_namefinder("towns", lat, lon, 4)
     results.push description_osm_namefinder("places", lat, lon, 10)
+    results.push description_geonames(lat, lon)
 
     render :update do |page|
       page.replace_html :search_results_content, :partial => 'results', :object => results
@@ -196,6 +197,24 @@ private
     return { :type => types.capitalize, :source => "OpenStreetMap Namefinder", :url => "http://www.frankieandshadow.com/osm/", :error => "Error contacting www.frankieandshadow.com: #{ex.to_s}" }
   end
 
+  def description_geonames(lat, lon)
+    results = Array.new
+
+    # ask geonames.org
+    response = fetch_xml("http://ws.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}")
+
+    # parse the response
+    response.elements.each("geonames/countrySubdivision") do |geoname|
+      name = geoname.get_text("adminName1").to_s
+      country = geoname.get_text("countryName").to_s
+      results.push({:prefix => "#{name}, #{country}"})
+    end
+
+    return { :type => "Location", :source => "GeoNames", :url => "http://www.geonames.org/", :results => results }
+  rescue Exception => ex
+    return { :type => types.capitalize, :source => "OpenStreetMap Namefinder", :url => "http://www.frankieandshadow.com/osm/", :error => "Error contacting www.frankieandshadow.com: #{ex.to_s}" }
+  end
+
   def fetch_text(url)
     return Net::HTTP.get(URI.parse(url))
   end
diff --git a/app/helpers/geocoder_helper.rb b/app/helpers/geocoder_helper.rb
index 879b1dca1..75e816651 100644
--- a/app/helpers/geocoder_helper.rb
+++ b/app/helpers/geocoder_helper.rb
@@ -4,7 +4,7 @@ module GeocoderHelper
     #html_options[:title] = strip_tags(result[:description]) if result[:description]
     html = ""
     html << result[:prefix] if result[:prefix]
-    html << link_to_function(result[:name], "setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options) 
+    html << link_to_function(result[:name], "setPosition(#{result[:lat]}, #{result[:lon]}, #{result[:zoom]})", html_options)  if result[:name]
     html << result[:suffix] if result[:suffix]
     return html
   end