X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0c549650eb5ba62e64046f5981e7fda6d9689e0d..04dbf32b73f38adec4d1209bbde87510f279fbe7:/app/controllers/geocoder_controller.rb?ds=sidebyside diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index f4093c75a..f286ab9d3 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -3,18 +3,21 @@ class GeocoderController < ApplicationController require 'net/http' require 'rexml/document' - POSTCODE_ZOOM = 15 - GEONAMES_ZOOM = 12 - def search query = params[:query] results = Array.new - if query.match(/^\d{5}(-\d{4})?$/) + query.sub(/^\s+/, "") + query.sub(/\s+$/, "") + + if query.match(/^[+-]?\d+(\.\d*)?\s*[\s,]\s*[+-]?\d+(\.\d*)?$/) + results.push search_latlon(query) + elsif query.match(/^\d{5}(-\d{4})?$/) results.push search_us_postcode(query) - 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) + 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) results.push search_uk_postcode(query) - elsif query.match(/[A-Z]\d[A-Z]\s*\d[A-Z]\d/i) + results.push search_osm_namefinder(query) + elsif query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i) results.push search_ca_postcode(query) else results.push search_osm_namefinder(query) @@ -28,7 +31,7 @@ class GeocoderController < ApplicationController if results_count == 1 position = results.collect { |s| s[:results] }.compact.flatten[0] - page.call "setPosition", position[:lat], position[:lon], position[:zoom] + page.call "setPosition", position[:lat].to_f, position[:lon].to_f, position[:zoom].to_i else page.call "openSidebar" end @@ -54,6 +57,29 @@ class GeocoderController < ApplicationController private + def search_latlon(query) + results = Array.new + + # decode the location + if m = query.match(/^([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)$/) + lat = m[1].to_f + lon = m[3].to_f + end + + # generate results + if lat < -90 or lat > 90 + return { :source => "Internal", :url => "http://openstreetmap.org/", :error => "Latitude #{lat} out of range" } + elsif lon < -180 or lon > 180 + return { :source => "Internal", :url => "http://openstreetmap.org/", :error => "Longitude #{lon} out of range" } + else + results.push({:lat => lat, :lon => lon, + :zoom => APP_CONFIG['postcode_zoom'], + :name => "#{lat}, #{lon}"}) + + return { :source => "Internal", :url => "http://openstreetmap.org/", :results => results } + end + end + def search_us_postcode(query) results = Array.new @@ -63,7 +89,8 @@ private # parse the response unless response.match(/couldn't find this zip/) data = response.split(/\s*,\s+/) # lat,long,town,state,zip - results.push({:lat => data[0], :lon => data[1], :zoom => POSTCODE_ZOOM, + results.push({:lat => data[0], :lon => data[1], + :zoom => APP_CONFIG['postcode_zoom'], :prefix => "#{data[2]}, #{data[3]}, ", :name => data[4]}) end @@ -83,8 +110,10 @@ private unless response.match(/Error/) dataline = response.split(/\n/)[1] data = dataline.split(/,/) # easting,northing,postcode,lat,long - results.push({:lat => data[3], :lon => data[4], :zoom => POSTCODE_ZOOM, - :name => data[2].gsub(/'/, "")}) + postcode = data[2].gsub(/'/, "") + zoom = APP_CONFIG['postcode_zoom'] - postcode.count("#") + results.push({:lat => data[3], :lon => data[4], :zoom => zoom, + :name => postcode}) end return { :source => "NPEMap / FreeThePostcode", :url => "http://www.npemap.org.uk/", :results => results } @@ -99,10 +128,10 @@ private response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}") # parse the response - unless response.get_elements("geodata/error") + if response.get_elements("geodata/error").empty? results.push({:lat => response.get_text("geodata/latt").to_s, :lon => response.get_text("geodata/longt").to_s, - :zoom => POSTCODE_ZOOM, + :zoom => APP_CONFIG['postcode_zoom'], :name => query.upcase}) end @@ -115,7 +144,7 @@ private results = Array.new # ask OSM namefinder - response = fetch_xml("http://www.frankieandshadow.com/osm/search.xml?find=#{escape_query(query)}") + response = fetch_xml("http://gazetteer.openstreetmap.org/namefinder/search.xml?find=#{escape_query(query)}") # parse the response response.elements.each("searchresults/named") do |named| @@ -126,28 +155,62 @@ private type = named.attributes["info"].to_s.capitalize name = named.attributes["name"].to_s description = named.elements["description"].to_s + if name.empty? prefix = "" name = type else prefix = "#{type} " end + if place distance = format_distance(place.attributes["approxdistance"].to_i) direction = format_direction(place.attributes["direction"].to_i) - placename = place.attributes["name"].to_s + placename = format_name(place.attributes["name"].to_s) suffix = ", #{distance} #{direction} of #{placename}" + + if place.attributes["rank"].to_i <= 30 + parent = nil + parentrank = 0 + parentscore = 0 + + place.elements.each("nearestplaces/named") do |nearest| + nearestrank = nearest.attributes["rank"].to_i + nearestscore = nearestrank / nearest.attributes["distance"].to_f + + if nearestrank > 30 and + ( nearestscore > parentscore or + ( nearestscore == parentscore and nearestrank > parentrank ) ) + parent = nearest + parentrank = nearestrank + parentscore = nearestscore + end + end + + if parent + parentname = format_name(parent.attributes["name"].to_s) + + if place.attributes["info"].to_s == "suburb" + suffix = "#{suffix}, #{parentname}" + else + parentdistance = format_distance(parent.attributes["approxdistance"].to_i) + parentdirection = format_direction(parent.attributes["direction"].to_i) + suffix = "#{suffix} (#{parentdistance} #{parentdirection} of #{parentname})" + end + end + end else suffix = "" end + results.push({:lat => lat, :lon => lon, :zoom => zoom, :prefix => prefix, :name => name, :suffix => suffix, :description => description}) end - return { :source => "OpenStreetMap Namefinder", :url => "http://www.frankieandshadow.com/osm/", :results => results } + return { :source => "OpenStreetMap Namefinder", :url => "http://gazetteer.openstreetmap.org/namefinder/", :results => results } rescue Exception => ex - return { :source => "OpenStreetMap Namefinder", :url => "http://www.frankieandshadow.com/osm/", :error => "Error contacting www.frankieandshadow.com: #{ex.to_s}" } + return { :source => "OpenStreetMap Namefinder", :url => "http://gazetteer.openstreetmap.org/namefinder/", :error => "Error contacting gazetteer.openstreetmap.org: #{ex.to_s}" } end def search_geonames(query) @@ -162,7 +225,8 @@ private lon = geoname.get_text("lng").to_s name = geoname.get_text("name").to_s country = geoname.get_text("countryName").to_s - results.push({:lat => lat, :lon => lon, :zoom => GEONAMES_ZOOM, + results.push({:lat => lat, :lon => lon, + :zoom => APP_CONFIG['geonames_zoom'], :name => name, :suffix => ", #{country}"}) end @@ -176,7 +240,7 @@ private results = Array.new # ask OSM namefinder - response = fetch_xml("http://www.frankieandshadow.com/osm/search.xml?find=#{types}+near+#{lat},#{lon}&max=#{max}") + response = fetch_xml("http://gazetteer.openstreetmap.org/namefinder/search.xml?find=#{types}+near+#{lat},#{lon}&max=#{max}") # parse the response response.elements.each("searchresults/named") do |named| @@ -195,9 +259,9 @@ private :description => description}) end - return { :type => types.capitalize, :source => "OpenStreetMap Namefinder", :url => "http://www.frankieandshadow.com/osm/", :results => results } + return { :type => types.capitalize, :source => "OpenStreetMap Namefinder", :url => "http://gazetteer.openstreetmap.org/namefinder/", :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}" } + return { :type => types.capitalize, :source => "OpenStreetMap Namefinder", :url => "http://gazetteer.openstreetmap.org/namefinder/", :error => "Error contacting gazetteer.openstreetmap.org: #{ex.to_s}" } end def description_geonames(lat, lon) @@ -215,7 +279,7 @@ private 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}" } + return { :type => "Location", :source => "GeoNames", :url => "http://www.geonames.org/", :error => "Error contacting ws.geonames.org: #{ex.to_s}" } end def fetch_text(url) @@ -242,6 +306,10 @@ private return "west" end + def format_name(name) + return name.gsub(/( *\[[^\]]*\])*$/, "") + end + def count_results(results) count = 0