X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a46ecae7570abafcfe350d881f614db7159c5487..10065abea62eee73eb572be6fd6bcbb4a6f9a6d9:/app/controllers/geocoder_controller.rb diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 3431fb8d3..7d05b6765 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -6,6 +6,7 @@ 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 @@ -14,18 +15,19 @@ class GeocoderController < ApplicationController if @params[:lat] && @params[:lon] @sources.push "latlon" @sources.push "osm_nominatim_reverse" - @sources.push "geonames_reverse" if defined?(GEONAMES_USERNAME) + @sources.push "geonames_reverse" if Settings.key?(:geonames_username) elsif @params[:query] - if @params[:query] =~ /^\d{5}(-\d{4})?$/ + case @params[:query] + when /^\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 + when /^(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 + when /^[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) + @sources.push "geonames" if Settings.key?(:geonames_username) end end @@ -49,6 +51,7 @@ class GeocoderController < ApplicationController :zoom => params[:zoom], :name => "#{lat}, #{lon}") end + if lon >= -90 && lon <= 90 && lat >= -180 && lat <= 180 @results.push(:lat => lon, :lon => lat, :zoom => params[:zoom], @@ -61,7 +64,6 @@ class GeocoderController < ApplicationController else render :action => "results" end - else # Coordinates in a query have come with markers for latitude and longitude. if lat < -90 || lat > 90 @@ -92,13 +94,13 @@ class GeocoderController < ApplicationController if response.get_elements("geodata/error").empty? @results.push(:lat => response.text("geodata/latt"), :lon => response.text("geodata/longt"), - :zoom => POSTCODE_ZOOM, + :zoom => Settings.postcode_zoom, :name => query.upcase) end render :action => "results" - rescue StandardError => ex - @error = "Error contacting geocoder.ca: #{ex}" + rescue StandardError => e + @error = "Error contacting geocoder.ca: #{e}" render :action => "error" end @@ -117,7 +119,7 @@ class GeocoderController < ApplicationController 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("#{Settings.nominatim_url}search?format=xml&extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") # extract the results from the response results = response.elements["searchresults"] @@ -147,10 +149,10 @@ 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 @@ -165,8 +167,8 @@ class GeocoderController < ApplicationController end render :action => "results" - rescue StandardError => ex - @error = "Error contacting nominatim.openstreetmap.org: #{ex}" + rescue StandardError => e + @error = "Error contacting nominatim.openstreetmap.org: #{e}" render :action => "error" end @@ -181,7 +183,7 @@ class GeocoderController < ApplicationController @results = [] # ask geonames.org - response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&lang=#{lang}&maxRows=20&username=#{GEONAMES_USERNAME}") + response = fetch_xml("http://api.geonames.org/search?q=#{escape_query(query)}&lang=#{lang}&maxRows=20&username=#{Settings.geonames_username}") # parse the response response.elements.each("geonames/geoname") do |geoname| @@ -191,14 +193,14 @@ class GeocoderController < ApplicationController country = geoname.text("countryName") @results.push(:lat => lat, :lon => lon, - :zoom => GEONAMES_ZOOM, + :zoom => Settings.geonames_zoom, :name => name, :suffix => ", #{country}") end render :action => "results" - rescue StandardError => ex - @error = "Error contacting api.geonames.org: #{ex}" + rescue StandardError => e + @error = "Error contacting api.geonames.org: #{e}" render :action => "error" end @@ -212,7 +214,7 @@ class GeocoderController < ApplicationController @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("#{Settings.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/result") do |result| @@ -229,8 +231,8 @@ class GeocoderController < ApplicationController end render :action => "results" - rescue StandardError => ex - @error = "Error contacting nominatim.openstreetmap.org: #{ex}" + rescue StandardError => e + @error = "Error contacting nominatim.openstreetmap.org: #{e}" render :action => "error" end @@ -246,7 +248,7 @@ class GeocoderController < ApplicationController @results = [] # ask geonames.org - response = fetch_xml("http://api.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}&lang=#{lang}&username=#{GEONAMES_USERNAME}") + response = fetch_xml("http://api.geonames.org/countrySubdivision?lat=#{lat}&lng=#{lon}&lang=#{lang}&username=#{Settings.geonames_username}") # parse the response response.elements.each("geonames/countrySubdivision") do |geoname| @@ -254,14 +256,14 @@ class GeocoderController < ApplicationController country = geoname.text("countryName") @results.push(:lat => lat, :lon => lon, - :zoom => GEONAMES_ZOOM, + :zoom => Settings.geonames_zoom, :name => name, :suffix => ", #{country}") end render :action => "results" - rescue StandardError => ex - @error = "Error contacting api.geonames.org: #{ex}" + rescue StandardError => e + @error = "Error contacting api.geonames.org: #{e}" render :action => "error" end @@ -305,7 +307,9 @@ class GeocoderController < ApplicationController 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, :latlon_digits => true).delete(:query) + params.merge!(:lat => latlon[1].to_f, :lon => latlon[3].to_f).delete(:query) + + params[:latlon_digits] = true unless params[:whereami] end end