Include a general location from GeoNames in the reverse geocode description.
This commit is contained in:
parent
3db77411b8
commit
e376f3c009
2 changed files with 20 additions and 1 deletions
|
@ -41,6 +41,7 @@ class GeocoderController < ApplicationController
|
||||||
results.push description_osm_namefinder("cities", lat, lon, 2)
|
results.push description_osm_namefinder("cities", lat, lon, 2)
|
||||||
results.push description_osm_namefinder("towns", lat, lon, 4)
|
results.push description_osm_namefinder("towns", lat, lon, 4)
|
||||||
results.push description_osm_namefinder("places", lat, lon, 10)
|
results.push description_osm_namefinder("places", lat, lon, 10)
|
||||||
|
results.push description_geonames(lat, lon)
|
||||||
|
|
||||||
render :update do |page|
|
render :update do |page|
|
||||||
page.replace_html :search_results_content, :partial => 'results', :object => results
|
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}" }
|
return { :type => types.capitalize, :source => "OpenStreetMap Namefinder", :url => "http://www.frankieandshadow.com/osm/", :error => "Error contacting www.frankieandshadow.com: #{ex.to_s}" }
|
||||||
end
|
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)
|
def fetch_text(url)
|
||||||
return Net::HTTP.get(URI.parse(url))
|
return Net::HTTP.get(URI.parse(url))
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,7 +4,7 @@ module GeocoderHelper
|
||||||
#html_options[:title] = strip_tags(result[:description]) if result[:description]
|
#html_options[:title] = strip_tags(result[:description]) if result[:description]
|
||||||
html = ""
|
html = ""
|
||||||
html << result[:prefix] if result[:prefix]
|
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]
|
html << result[:suffix] if result[:suffix]
|
||||||
return html
|
return html
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue