X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bbf30e76e4bfcd70e62fc84ecd32c5e494506e9e..873c1cb84e2fe475bc4ff566d71929fdcc35787d:/app/controllers/geocoder_controller.rb diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 8394b3e6e..73422c2f0 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -1,3 +1,5 @@ +# coding: utf-8 + class GeocoderController < ApplicationController require 'uri' require 'net/http' @@ -5,50 +7,36 @@ class GeocoderController < ApplicationController before_filter :authorize_web before_filter :set_locale + before_filter :require_oauth, :only => [:search] def search - @query = params[:query] - @sources = Array.new - - @query.sub(/^\s+/, "") - @query.sub(/\s+$/, "") + normalize_params - if @query.match(/^[+-]?\d+(\.\d*)?\s*[\s,]\s*[+-]?\d+(\.\d*)?$/) + @sources = [] + if params[:lat] && params[:lon] @sources.push "latlon" - elsif @query.match(/^\d{5}(-\d{4})?$/) + @sources.push "osm_nominatim_reverse" + @sources.push "geonames_reverse" if defined?(GEONAMES_USERNAME) + elsif params[:query].match(/^\d{5}(-\d{4})?$/) @sources.push "us_postcode" @sources.push "osm_nominatim" - 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 params[: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) @sources.push "uk_postcode" @sources.push "osm_nominatim" - elsif @query.match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i) + elsif params[:query].match(/^[A-Z]\d[A-Z]\s*\d[A-Z]\d$/i) @sources.push "ca_postcode" @sources.push "osm_nominatim" else @sources.push "osm_nominatim" - @sources.push "geonames" + @sources.push "geonames" if defined?(GEONAMES_USERNAME) end - render :update do |page| - page.replace_html :sidebar_content, :partial => "search" - page.call "openSidebar" - end + render :layout => map_layout end def search_latlon - # get query parameters - query = params[:query] - - # create result array - @results = Array.new - - # decode the location - if m = query.match(/^\s*([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)\s*$/) - lat = m[1].to_f - lon = m[3].to_f - end - - # generate results + lat = params[:lat].to_f + lon = params[:lon].to_f if lat < -90 or lat > 90 @error = "Latitude #{lat} out of range" render :action => "error" @@ -56,9 +44,9 @@ class GeocoderController < ApplicationController @error = "Longitude #{lon} out of range" render :action => "error" else - @results.push({:lat => lat, :lon => lon, - :zoom => APP_CONFIG['postcode_zoom'], - :name => "#{lat}, #{lon}"}) + @results = [{:lat => lat, :lon => lon, + :zoom => params[:zoom], + :name => "#{lat}, #{lon}"}] render :action => "results" end @@ -78,7 +66,7 @@ class GeocoderController < ApplicationController 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 => APP_CONFIG['postcode_zoom'], + :zoom => POSTCODE_ZOOM, :prefix => "#{data[2]}, #{data[3]},", :name => data[4]}) end @@ -104,7 +92,7 @@ class GeocoderController < ApplicationController dataline = response.split(/\n/)[1] data = dataline.split(/,/) # easting,northing,postcode,lat,long postcode = data[2].gsub(/'/, "") - zoom = APP_CONFIG['postcode_zoom'] - postcode.count("#") + zoom = POSTCODE_ZOOM - postcode.count("#") @results.push({:lat => data[3], :lon => data[4], :zoom => zoom, :name => postcode}) end @@ -127,7 +115,7 @@ class GeocoderController < ApplicationController 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 => APP_CONFIG['postcode_zoom'], + :zoom => POSTCODE_ZOOM, :name => query.upcase}) end @@ -137,84 +125,6 @@ class GeocoderController < ApplicationController render :action => "error" end - def search_osm_namefinder - # get query parameters - query = params[:query] - - # create result array - @results = Array.new - - # ask OSM namefinder - response = fetch_xml("http://gazetteer.openstreetmap.org/namefinder/search.xml?find=#{escape_query(query)}") - - # parse the response - response.elements.each("searchresults/named") do |named| - lat = named.attributes["lat"].to_s - lon = named.attributes["lon"].to_s - zoom = named.attributes["zoom"].to_s - place = named.elements["place/named"] || named.elements["nearestplaces/named"] - 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 = t "geocoder.search_osm_namefinder.prefix", :type => type - end - - if place - distance = format_distance(place.attributes["approxdistance"].to_i) - direction = format_direction(place.attributes["direction"].to_i) - placename = format_name(place.attributes["name"].to_s) - suffix = t "geocoder.search_osm_namefinder.suffix_place", :distance => distance, :direction => direction, :placename => 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 = t "geocoder.search_osm_namefinder.suffix_suburb", :suffix => suffix, :parentname => parentname - else - parentdistance = format_distance(parent.attributes["approxdistance"].to_i) - parentdirection = format_direction(parent.attributes["direction"].to_i) - suffix = t "geocoder.search_osm_namefinder.suffix_parent", :suffix => suffix, :parentdistance => parentdistance, :parentdirection => parentdirection, :parentname => parentname - end - end - end - else - suffix = "" - end - - @results.push({:lat => lat, :lon => lon, :zoom => zoom, - :prefix => prefix, :name => name, :suffix => suffix, - :description => description}) - end - - render :action => "results" - rescue Exception => ex - @error = "Error contacting gazetteer.openstreetmap.org: #{ex.to_s}" - render :action => "error" - end - def search_osm_nominatim # get query parameters query = params[:query] @@ -234,7 +144,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=#{http_accept_language.user_preferred_languages.join(',')}") # create result array @results = Array.new @@ -253,30 +163,45 @@ class GeocoderController < ApplicationController type = place.attributes["type"].to_s name = place.attributes["display_name"].to_s min_lat,max_lat,min_lon,max_lon = place.attributes["boundingbox"].to_s.split(",") - prefix = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize + if type.empty? + prefix_name = "" + else + prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize + end + if klass == 'boundary' and type == 'administrative' + rank = (place.attributes["place_rank"].to_i + 1) / 2 + prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name + end + prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name + object_type = place.attributes["osm_type"] + object_id = place.attributes["osm_id"] @results.push({:lat => lat, :lon => lon, :min_lat => min_lat, :max_lat => max_lat, :min_lon => min_lon, :max_lon => max_lon, - :prefix => prefix, :name => name}) + :prefix => prefix, :name => name, + :type => object_type, :id => object_id}) @more_params[:exclude].push(place.attributes["place_id"].to_s) end render :action => "results" - rescue Exception => ex - @error = "Error contacting nominatim.openstreetmap.org: #{ex.to_s}" - render :action => "error" +# rescue Exception => ex +# @error = "Error contacting nominatim.openstreetmap.org: #{ex.to_s}" +# render :action => "error" end def search_geonames # get query parameters query = params[:query] + # get preferred language + lang = I18n.locale.to_s.split("-").first + # create result array @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)}&lang=#{lang}&maxRows=20&username=#{GEONAMES_USERNAME}") # parse the response response.elements.each("geonames/geoname") do |geoname| @@ -285,7 +210,7 @@ class GeocoderController < ApplicationController name = geoname.get_text("name").to_s country = geoname.get_text("countryName").to_s @results.push({:lat => lat, :lon => lon, - :zoom => APP_CONFIG['geonames_zoom'], + :zoom => GEONAMES_ZOOM, :name => name, :suffix => ", #{country}"}) end @@ -296,55 +221,7 @@ class GeocoderController < ApplicationController render :action => "error" end - def description - @sources = Array.new - - @sources.push({ :name => "osm_nominatim" }) - @sources.push({ :name => "geonames" }) - - render :update do |page| - page.replace_html :sidebar_content, :partial => "description" - page.call "openSidebar" - end - end - - def description_osm_namefinder - # get query parameters - lat = params[:lat] - lon = params[:lon] - types = params[:types] - max = params[:max] - - # create result array - @results = Array.new - - # ask OSM namefinder - 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| - lat = named.attributes["lat"].to_s - lon = named.attributes["lon"].to_s - zoom = named.attributes["zoom"].to_s - place = named.elements["place/named"] || named.elements["nearestplaces/named"] - type = named.attributes["info"].to_s - name = named.attributes["name"].to_s - description = named.elements["description"].to_s - distance = format_distance(place.attributes["approxdistance"].to_i) - direction = format_direction((place.attributes["direction"].to_i - 180) % 360) - prefix = t "geocoder.description_osm_namefinder.prefix", :distance => distance, :direction => direction, :type => type - @results.push({:lat => lat, :lon => lon, :zoom => zoom, - :prefix => prefix.capitalize, :name => name, - :description => description}) - end - - render :action => "results" - rescue Exception => ex - @error = "Error contacting gazetteer.openstreetmap.org: #{ex.to_s}" - render :action => "error" - end - - def description_osm_nominatim + def search_osm_nominatim_reverse # get query parameters lat = params[:lat] lon = params[:lon] @@ -353,14 +230,21 @@ class GeocoderController < ApplicationController # create result array @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(',')}") + # ask nominatim + response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") # parse the response - response.elements.each("reversegeocode") do |result| - description = result.get_text("result").to_s + response.elements.each("reversegeocode/result") do |result| + lat = result.attributes["lat"].to_s + lon = result.attributes["lon"].to_s + object_type = result.attributes["osm_type"] + object_id = result.attributes["osm_id"] + description = result.get_text.to_s - @results.push({:prefix => "#{description}"}) + @results.push({:lat => lat, :lon => lon, + :zoom => zoom, + :name => description, + :type => object_type, :id => object_id}) end render :action => "results" @@ -369,22 +253,28 @@ class GeocoderController < ApplicationController render :action => "error" end - def description_geonames + def search_geonames_reverse # get query parameters lat = params[:lat] lon = params[:lon] + # get preferred language + lang = I18n.locale.to_s.split("-").first + # create result array @results = Array.new # ask geonames.org - response = fetch_xml("http://ws.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}") + response = fetch_xml("http://api.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}&lang=#{lang}&username=#{GEONAMES_USERNAME}") # 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}"}) + @results.push({:lat => lat, :lon => lon, + :zoom => GEONAMES_ZOOM, + :name => name, + :suffix => ", #{country}"}) end render :action => "results" @@ -435,4 +325,67 @@ private def escape_query(query) return URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]", false, 'N')) end + + def normalize_params + query = params[:query] + return unless query + + query.strip! + + if latlon = query.match(/^([NS])\s*(\d{1,3}(\.\d*)?)\W*([EW])\s*(\d{1,3}(\.\d*)?)$/).try(:captures) # [NSEW] decimal degrees + params.merge!(nsew_to_decdeg(latlon)).delete(:query) + elsif latlon = query.match(/^(\d{1,3}(\.\d*)?)\s*([NS])\W*(\d{1,3}(\.\d*)?)\s*([EW])$/).try(:captures) # decimal degrees [NSEW] + params.merge!(nsew_to_decdeg(latlon)).delete(:query) + + elsif latlon = query.match(/^([NS])\s*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\W*([EW])\s*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?$/).try(:captures) # [NSEW] degrees, decimal minutes + params.merge!(ddm_to_decdeg(latlon)).delete(:query) + elsif latlon = query.match(/^(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\s*([NS])\W*(\d{1,3})°?\s*(\d{1,3}(\.\d*)?)?['′]?\s*([EW])$/).try(:captures) # degrees, decimal minutes [NSEW] + params.merge!(ddm_to_decdeg(latlon)).delete(:query) + + elsif latlon = query.match(/^([NS])\s*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?\W*([EW])\s*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?$/).try(:captures) # [NSEW] degrees, minutes, decimal seconds + params.merge!(dms_to_decdeg(latlon)).delete(:query) + elsif latlon = query.match(/^(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]\s*([NS])\W*(\d{1,3})°?\s*(\d{1,2})['′]?\s*(\d{1,3}(\.\d*)?)?["″]?\s*([EW])$/).try(:captures) # degrees, minutes, decimal seconds [NSEW] + params.merge!(dms_to_decdeg(latlon)).delete(:query) + + elsif latlon = query.match(/^\s*([+-]?\d+(\.\d*)?)\s*[\s,]\s*([+-]?\d+(\.\d*)?)\s*$/) + params.merge!({:lat => latlon[1].to_f, :lon => latlon[3].to_f}).delete(:query) + end + end + + def nsew_to_decdeg(captures) + begin + Float(captures[0]) + captures[2].downcase != 's' ? lat = captures[0].to_f : lat = -(captures[0].to_f) + captures[5].downcase != 'w' ? lon = captures[3].to_f : lon = -(captures[3].to_f) + rescue + captures[0].downcase != 's' ? lat = captures[1].to_f : lat = -(captures[1].to_f) + captures[3].downcase != 'w' ? lon = captures[4].to_f : lon = -(captures[4].to_f) + end + {:lat => lat, :lon => lon} + end + + def ddm_to_decdeg(captures) + begin + Float(captures[0]) + captures[3].downcase != 's' ? lat = captures[0].to_f + captures[1].to_f/60 : lat = -(captures[0].to_f + captures[1].to_f/60) + captures[7].downcase != 'w' ? lon = captures[4].to_f + captures[5].to_f/60 : lon = -(captures[4].to_f + captures[5].to_f/60) + rescue + captures[0].downcase != 's' ? lat = captures[1].to_f + captures[2].to_f/60 : lat = -(captures[1].to_f + captures[2].to_f/60) + captures[4].downcase != 'w' ? lon = captures[5].to_f + captures[6].to_f/60 : lon = -(captures[5].to_f + captures[6].to_f/60) + end + {:lat => lat, :lon => lon} + end + + def dms_to_decdeg(captures) + begin + Float(captures[0]) + captures[4].downcase != 's' ? lat = captures[0].to_f + (captures[1].to_f + captures[2].to_f/60)/60 : lat = -(captures[0].to_f + (captures[1].to_f + captures[2].to_f/60)/60) + captures[9].downcase != 'w' ? lon = captures[5].to_f + (captures[6].to_f + captures[7].to_f/60)/60 : lon = -(captures[5].to_f + (captures[6].to_f + captures[7].to_f/60)/60) + rescue + captures[0].downcase != 's' ? lat = captures[1].to_f + (captures[2].to_f + captures[3].to_f/60)/60 : lat = -(captures[1].to_f + (captures[2].to_f + captures[3].to_f/60)/60) + captures[5].downcase != 'w' ? lon = captures[6].to_f + (captures[7].to_f + captures[8].to_f/60)/60 : lon = -(captures[6].to_f + (captures[7].to_f + captures[8].to_f/60)/60) + end + {:lat => lat, :lon => lon} + end + end