X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/420a7289a0b08eee091f6650c2e83166df3fbe69..ed74bc036b3203bb14c3fbb986c077f2958d004d:/app/controllers/geocoder_controller.rb?ds=inline diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index da5245687..43f276efa 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -6,27 +6,17 @@ class GeocoderController < ApplicationController before_action :authorize_web before_action :set_locale before_action :require_oauth, :only => [:search] + authorize_resource :class => false def search @params = normalize_params @sources = [] if @params[:lat] && @params[:lon] - @sources.push "latlon" - @sources.push "osm_nominatim_reverse" - @sources.push "geonames_reverse" if defined?(GEONAMES_USERNAME) + @sources.push(:name => "latlon", :url => root_path) + @sources.push(:name => "osm_nominatim_reverse", :url => nominatim_reverse_url(:format => "html")) elsif @params[:query] - if @params[:query] =~ /^\d{5}(-\d{4})?$/ - @sources.push "osm_nominatim" - elsif @params[:query] =~ /^(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 "osm_nominatim" - elsif @params[:query] =~ /^[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" if defined?(GEONAMES_USERNAME) - end + @sources.push(:name => "osm_nominatim", :url => nominatim_url(:format => "html")) end if @sources.empty? @@ -45,15 +35,15 @@ class GeocoderController < ApplicationController @results = [] if lat >= -90 && lat <= 90 && lon >= -180 && lon <= 180 - @results.push(:lat => lat, :lon => lon, + @results.push(:lat => params[:lat], :lon => params[:lon], :zoom => params[:zoom], - :name => "#{lat}, #{lon}") + :name => "#{params[:lat]}, #{params[:lon]}") end if lon >= -90 && lon <= 90 && lat >= -180 && lat <= 180 - @results.push(:lat => lon, :lon => lat, + @results.push(:lat => params[:lon], :lon => params[:lat], :zoom => params[:zoom], - :name => "#{lon}, #{lat}") + :name => "#{params[:lon]}, #{params[:lat]}") end if @results.empty? @@ -71,59 +61,21 @@ class GeocoderController < ApplicationController @error = "Longitude #{lon} out of range" render :action => "error" else - @results = [{ :lat => lat, :lon => lon, + @results = [{ :lat => params[:lat], :lon => params[:lon], :zoom => params[:zoom], - :name => "#{lat}, #{lon}" }] + :name => "#{params[:lat]}, #{params[:lon]}" }] render :action => "results" end end end - def search_ca_postcode - # get query parameters - query = params[:query] - @results = [] - - # ask geocoder.ca (note - they have a per-day limit) - response = fetch_xml("https://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}") - - # parse the response - if response.get_elements("geodata/error").empty? - @results.push(:lat => response.text("geodata/latt"), - :lon => response.text("geodata/longt"), - :zoom => POSTCODE_ZOOM, - :name => query.upcase) - end - - render :action => "results" - rescue StandardError => ex - @error = "Error contacting geocoder.ca: #{ex}" - render :action => "error" - end - def search_osm_nominatim - # get query parameters - query = params[:query] - minlon = params[:minlon] - minlat = params[:minlat] - maxlon = params[:maxlon] - maxlat = params[:maxlat] - - # get view box - viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}" if minlon && minlat && maxlon && maxlat - - # get objects to excude - exclude = "&exclude_place_ids=#{params[:exclude]}" if params[:exclude] - # ask nominatim - response = fetch_xml("#{NOMINATIM_URL}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") + response = fetch_xml(nominatim_url(:format => "xml")) # extract the results from the response - results = response.elements["searchresults"] - - # extract parameters from more_url - more_url_params = CGI.parse(URI.parse(results.attributes["more_url"]).query) + results = response.elements["searchresults"] # create result array @results = [] @@ -131,7 +83,7 @@ class GeocoderController < ApplicationController # create parameter hash for "more results" link @more_params = params .permit(:query, :minlon, :minlat, :maxlon, :maxlat, :exclude) - .merge(:exclude => more_url_params["exclude_place_ids"].first) + .merge(:exclude => results.attributes["exclude_place_ids"]) # parse the response results.elements.each("place") do |place| @@ -147,13 +99,13 @@ class GeocoderController < ApplicationController t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.tr("_", " ").capitalize end if klass == "boundary" && type == "administrative" - rank = (place.attributes["place_rank"].to_i + 1) / 2 + rank = (place.attributes["address_rank"].to_i + 1) / 2 prefix_name = t "geocoder.search_osm_nominatim.admin_levels.level#{rank}", :default => prefix_name place.elements["extratags"].elements.each("tag") do |extratag| - prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name if extratag.attributes["key"] == "place" + prefix_name = t "geocoder.search_osm_nominatim.prefix.place.#{extratag.attributes['value']}", :default => prefix_name if extratag.attributes["key"] == "linked_place" || extratag.attributes["key"] == "place" end end - prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name + prefix = t ".prefix_format", :name => prefix_name object_type = place.attributes["osm_type"] object_id = place.attributes["osm_id"] @@ -165,54 +117,21 @@ class GeocoderController < ApplicationController end render :action => "results" - rescue StandardError => ex - @error = "Error contacting nominatim.openstreetmap.org: #{ex}" - 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 = [] - - # ask geonames.org - 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| - lat = geoname.text("lat") - lon = geoname.text("lng") - name = geoname.text("name") - country = geoname.text("countryName") - - @results.push(:lat => lat, :lon => lon, - :zoom => GEONAMES_ZOOM, - :name => name, - :suffix => ", #{country}") - end - - render :action => "results" - rescue StandardError => ex - @error = "Error contacting api.geonames.org: #{ex}" + rescue StandardError => e + host = URI(Settings.nominatim_url).host + @error = "Error contacting #{host}: #{e}" render :action => "error" end def search_osm_nominatim_reverse # get query parameters - lat = params[:lat] - lon = params[:lon] zoom = params[:zoom] # create result array @results = [] # ask nominatim - response = fetch_xml("#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") + response = fetch_xml(nominatim_reverse_url(:format => "xml")) # parse the response response.elements.each("reversegeocode/result") do |result| @@ -229,44 +148,42 @@ class GeocoderController < ApplicationController end render :action => "results" - rescue StandardError => ex - @error = "Error contacting nominatim.openstreetmap.org: #{ex}" + rescue StandardError => e + host = URI(Settings.nominatim_url).host + @error = "Error contacting #{host}: #{e}" render :action => "error" end - def search_geonames_reverse - # get query parameters - lat = params[:lat] - lon = params[:lon] + private - # get preferred language - lang = I18n.locale.to_s.split("-").first + def nominatim_url(format: nil) + # get query parameters + query = params[:query] + minlon = params[:minlon] + minlat = params[:minlat] + maxlon = params[:maxlon] + maxlat = params[:maxlat] - # create result array - @results = [] + # get view box + viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}" if minlon && minlat && maxlon && maxlat - # ask geonames.org - response = fetch_xml("http://api.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}&lang=#{lang}&username=#{GEONAMES_USERNAME}") + # get objects to excude + exclude = "&exclude_place_ids=#{params[:exclude]}" if params[:exclude] - # parse the response - response.elements.each("geonames/countrySubdivision") do |geoname| - name = geoname.text("adminName1") - country = geoname.text("countryName") + # build url + "#{Settings.nominatim_url}search?format=#{format}&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}" + end - @results.push(:lat => lat, :lon => lon, - :zoom => GEONAMES_ZOOM, - :name => name, - :suffix => ", #{country}") - end + def nominatim_reverse_url(format: nil) + # get query parameters + lat = params[:lat] + lon = params[:lon] + zoom = params[:zoom] - render :action => "results" - rescue StandardError => ex - @error = "Error contacting api.geonames.org: #{ex}" - render :action => "error" + # build url + "#{Settings.nominatim_url}reverse?format=#{format}&lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}" end - private - def fetch_text(url) response = OSM.http_client.get(URI.parse(url)) @@ -289,64 +206,42 @@ class GeocoderController < ApplicationController if query = params[: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) + if latlon = query.match(/^(?[NS])\s*#{dms_regexp('ns')}\W*(?[EW])\s*#{dms_regexp('ew')}$/) || + query.match(/^#{dms_regexp('ns')}\s*(?[NS])\W*#{dms_regexp('ew')}\s*(?[EW])$/) + params.merge!(to_decdeg(latlon.named_captures.compact)).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(%r{^(?[+-]?\d+(?:\.\d+)?)(?:\s+|\s*[,/]\s*)(?[+-]?\d+(?:\.\d+)?)$}) + params.merge!(:lat => latlon["lat"], :lon => latlon["lon"]).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) - - params[:latlon_digits] = true unless params[:whereami] + params[:latlon_digits] = true end end params.permit(:query, :lat, :lon, :latlon_digits, :zoom, :minlat, :minlon, :maxlat, :maxlon) end - def nsew_to_decdeg(captures) - begin - Float(captures[0]) - lat = !captures[2].casecmp("s").zero? ? captures[0].to_f : -captures[0].to_f - lon = !captures[5].casecmp("w").zero? ? captures[3].to_f : -captures[3].to_f - rescue StandardError - lat = !captures[0].casecmp("s").zero? ? captures[1].to_f : -captures[1].to_f - lon = !captures[3].casecmp("w").zero? ? captures[4].to_f : -captures[4].to_f - end - { :lat => lat, :lon => lon } + def dms_regexp(name_prefix) + / + (?: (?<#{name_prefix}d>\d{1,3}(?:\.\d+)?)°? ) | + (?: (?<#{name_prefix}d>\d{1,3})°?\s*(?<#{name_prefix}m>\d{1,2}(?:\.\d+)?)['′]? ) | + (?: (?<#{name_prefix}d>\d{1,3})°?\s*(?<#{name_prefix}m>\d{1,2})['′]?\s*(?<#{name_prefix}s>\d{1,2}(?:\.\d+)?)["″]? ) + /x end - def ddm_to_decdeg(captures) - begin - Float(captures[0]) - lat = !captures[3].casecmp("s").zero? ? captures[0].to_f + captures[1].to_f / 60 : -(captures[0].to_f + captures[1].to_f / 60) - lon = !captures[7].casecmp("w").zero? ? captures[4].to_f + captures[5].to_f / 60 : -(captures[4].to_f + captures[5].to_f / 60) - rescue StandardError - lat = !captures[0].casecmp("s").zero? ? captures[1].to_f + captures[2].to_f / 60 : -(captures[1].to_f + captures[2].to_f / 60) - lon = !captures[4].casecmp("w").zero? ? captures[5].to_f + captures[6].to_f / 60 : -(captures[5].to_f + captures[6].to_f / 60) - end - { :lat => lat, :lon => lon } - end + def to_decdeg(captures) + ns = captures.fetch("ns").casecmp?("s") ? -1 : 1 + nsd = BigDecimal(captures.fetch("nsd", "0")) + nsm = BigDecimal(captures.fetch("nsm", "0")) + nss = BigDecimal(captures.fetch("nss", "0")) - def dms_to_decdeg(captures) - begin - Float(captures[0]) - lat = !captures[4].casecmp("s").zero? ? captures[0].to_f + (captures[1].to_f + captures[2].to_f / 60) / 60 : -(captures[0].to_f + (captures[1].to_f + captures[2].to_f / 60) / 60) - lon = !captures[9].casecmp("w").zero? ? captures[5].to_f + (captures[6].to_f + captures[7].to_f / 60) / 60 : -(captures[5].to_f + (captures[6].to_f + captures[7].to_f / 60) / 60) - rescue StandardError - lat = !captures[0].casecmp("s").zero? ? captures[1].to_f + (captures[2].to_f + captures[3].to_f / 60) / 60 : -(captures[1].to_f + (captures[2].to_f + captures[3].to_f / 60) / 60) - lon = !captures[5].casecmp("w").zero? ? captures[6].to_f + (captures[7].to_f + captures[8].to_f / 60) / 60 : -(captures[6].to_f + (captures[7].to_f + captures[8].to_f / 60) / 60) - end - { :lat => lat, :lon => lon } + ew = captures.fetch("ew").casecmp?("w") ? -1 : 1 + ewd = BigDecimal(captures.fetch("ewd", "0")) + ewm = BigDecimal(captures.fetch("ewm", "0")) + ews = BigDecimal(captures.fetch("ews", "0")) + + lat = ns * (nsd + (nsm / 60) + (nss / 3600)) + lon = ew * (ewd + (ewm / 60) + (ews / 3600)) + + { :lat => lat.round(6).to_s("F"), :lon => lon.round(6).to_s("F") } end end