X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5cbd4038edb32b0304bd766e70fc680ea447b52b..6ca22de4f2c68e4b14a6e2f0938a8657c33adc31:/app/controllers/geocoder_controller.rb diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 37cdc6557..da5245687 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -1,107 +1,83 @@ -# coding: utf-8 - class GeocoderController < ApplicationController - require 'cgi' - require 'uri' - require 'net/http' - require 'rexml/document' + require "cgi" + require "uri" + require "rexml/document" - before_filter :authorize_web - before_filter :set_locale - before_filter :require_oauth, :only => [:search] + before_action :authorize_web + before_action :set_locale + before_action :require_oauth, :only => [:search] def search - normalize_params - + @params = normalize_params @sources = [] - if params[:lat] && params[:lon] + + if @params[:lat] && @params[:lon] @sources.push "latlon" @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 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 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" if defined?(GEONAMES_USERNAME) + 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 end - render :layout => map_layout + if @sources.empty? + head :bad_request + else + render :layout => map_layout + end end def search_latlon lat = params[:lat].to_f lon = params[:lon].to_f - if lat < -90 || lat > 90 - @error = "Latitude #{lat} out of range" - render :action => "error" - elsif lon < -180 || lon > 180 - @error = "Longitude #{lon} out of range" - render :action => "error" - else - @results = [{ :lat => lat, :lon => lon, - :zoom => params[:zoom], - :name => "#{lat}, #{lon}" }] - - render :action => "results" - end - end - - def search_us_postcode - # get query parameters - query = params[:query] - - # create result array - @results = [] - - # ask geocoder.us (they have a non-commercial use api) - response = fetch_text("http://rpc.geocoder.us/service/csv?zip=#{escape_query(query)}") - # 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, - :prefix => "#{data[2]}, #{data[3]},", - :name => data[4]) - end + if params[:latlon_digits] + # We've got two nondescript numbers for a query, which can mean both "lat, lon" or "lon, lat". + @results = [] - render :action => "results" - rescue StandardError => ex - @error = "Error contacting rpc.geocoder.us: #{ex}" - render :action => "error" - end - - def search_uk_postcode - # get query parameters - query = params[:query] + if lat >= -90 && lat <= 90 && lon >= -180 && lon <= 180 + @results.push(:lat => lat, :lon => lon, + :zoom => params[:zoom], + :name => "#{lat}, #{lon}") + end - # create result array - @results = [] + if lon >= -90 && lon <= 90 && lat >= -180 && lat <= 180 + @results.push(:lat => lon, :lon => lat, + :zoom => params[:zoom], + :name => "#{lon}, #{lat}") + end - # ask npemap.org.uk to do a combined npemap + freethepostcode search - response = fetch_text("http://www.npemap.org.uk/cgi/geocoder.fcgi?format=text&postcode=#{escape_query(query)}") + if @results.empty? + @error = "Latitude or longitude are out of range" + render :action => "error" + else + render :action => "results" + end + else + # Coordinates in a query have come with markers for latitude and longitude. + if lat < -90 || lat > 90 + @error = "Latitude #{lat} out of range" + render :action => "error" + elsif lon < -180 || lon > 180 + @error = "Longitude #{lon} out of range" + render :action => "error" + else + @results = [{ :lat => lat, :lon => lon, + :zoom => params[:zoom], + :name => "#{lat}, #{lon}" }] - # parse the response - unless response.match(/Error/) - dataline = response.split(/\n/)[1] - data = dataline.split(/,/) # easting,northing,postcode,lat,long - postcode = data[2].gsub(/'/, "") - zoom = POSTCODE_ZOOM - postcode.count("#") - @results.push(:lat => data[3], :lon => data[4], :zoom => zoom, - :name => postcode) + render :action => "results" + end end - - render :action => "results" - rescue StandardError => ex - @error = "Error contacting www.npemap.org.uk: #{ex}" - render :action => "error" end def search_ca_postcode @@ -110,12 +86,12 @@ class GeocoderController < ApplicationController @results = [] # ask geocoder.ca (note - they have a per-day limit) - response = fetch_xml("http://geocoder.ca/?geoit=XML&postal=#{escape_query(query)}") + 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.get_text("geodata/latt").to_s, - :lon => response.get_text("geodata/longt").to_s, + @results.push(:lat => response.text("geodata/latt"), + :lon => response.text("geodata/longt"), :zoom => POSTCODE_ZOOM, :name => query.upcase) end @@ -135,15 +111,13 @@ class GeocoderController < ApplicationController maxlat = params[:maxlat] # get view box - if minlon && minlat && maxlon && maxlat - viewbox = "&viewbox=#{minlon},#{maxlat},#{maxlon},#{minlat}" - end + 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("http:#{NOMINATIM_URL}search?format=xml&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") + 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(',')}") # extract the results from the response results = response.elements["searchresults"] @@ -155,24 +129,29 @@ class GeocoderController < ApplicationController @results = [] # create parameter hash for "more results" link - @more_params = params.merge(:exclude => more_url_params["exclude_place_ids"].first) + @more_params = params + .permit(:query, :minlon, :minlat, :maxlon, :maxlat, :exclude) + .merge(:exclude => more_url_params["exclude_place_ids"].first) # parse the response results.elements.each("place") do |place| - lat = place.attributes["lat"].to_s - lon = place.attributes["lon"].to_s - klass = place.attributes["class"].to_s - 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(",") - if type.empty? - prefix_name = "" - else - prefix_name = t "geocoder.search_osm_nominatim.prefix.#{klass}.#{type}", :default => type.gsub("_", " ").capitalize - end - if klass == 'boundary' && type == 'administrative' + lat = place.attributes["lat"] + lon = place.attributes["lon"] + klass = place.attributes["class"] + type = place.attributes["type"] + name = place.attributes["display_name"] + min_lat, max_lat, min_lon, max_lon = place.attributes["boundingbox"].split(",") + prefix_name = if type.empty? + "" + else + 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 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" + end end prefix = t "geocoder.search_osm_nominatim.prefix_format", :name => prefix_name object_type = place.attributes["osm_type"] @@ -186,9 +165,9 @@ class GeocoderController < ApplicationController end render :action => "results" - # rescue StandardError => ex - # @error = "Error contacting nominatim.openstreetmap.org: #{ex.to_s}" - # render :action => "error" + rescue StandardError => ex + @error = "Error contacting nominatim.openstreetmap.org: #{ex}" + render :action => "error" end def search_geonames @@ -206,10 +185,11 @@ class GeocoderController < ApplicationController # parse the response response.elements.each("geonames/geoname") do |geoname| - lat = geoname.get_text("lat").to_s - lon = geoname.get_text("lng").to_s - name = geoname.get_text("name").to_s - country = geoname.get_text("countryName").to_s + 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, @@ -218,7 +198,7 @@ class GeocoderController < ApplicationController render :action => "results" rescue StandardError => ex - @error = "Error contacting ws.geonames.org: #{ex}" + @error = "Error contacting api.geonames.org: #{ex}" render :action => "error" end @@ -232,15 +212,15 @@ class GeocoderController < ApplicationController @results = [] # ask nominatim - response = fetch_xml("http:#{NOMINATIM_URL}reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}") + 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/result") do |result| - lat = result.attributes["lat"].to_s - lon = result.attributes["lon"].to_s + lat = result.attributes["lat"] + lon = result.attributes["lon"] object_type = result.attributes["osm_type"] object_id = result.attributes["osm_id"] - description = result.get_text.to_s + description = result.text @results.push(:lat => lat, :lon => lon, :zoom => zoom, @@ -270,8 +250,9 @@ class GeocoderController < ApplicationController # parse the response response.elements.each("geonames/countrySubdivision") do |geoname| - name = geoname.get_text("adminName1").to_s - country = geoname.get_text("countryName").to_s + name = geoname.text("adminName1") + country = geoname.text("countryName") + @results.push(:lat => lat, :lon => lon, :zoom => GEONAMES_ZOOM, :name => name, @@ -280,87 +261,67 @@ class GeocoderController < ApplicationController render :action => "results" rescue StandardError => ex - @error = "Error contacting ws.geonames.org: #{ex}" + @error = "Error contacting api.geonames.org: #{ex}" render :action => "error" end private def fetch_text(url) - Net::HTTP.get(URI.parse(url)) + response = OSM.http_client.get(URI.parse(url)) + + if response.success? + response.body + else + raise response.status.to_s + end end def fetch_xml(url) REXML::Document.new(fetch_text(url)) end - def format_distance(distance) - t("geocoder.distance", :count => distance) - end - - def format_direction(bearing) - return t("geocoder.direction.south_west") if bearing >= 22.5 && bearing < 67.5 - return t("geocoder.direction.south") if bearing >= 67.5 && bearing < 112.5 - return t("geocoder.direction.south_east") if bearing >= 112.5 && bearing < 157.5 - return t("geocoder.direction.east") if bearing >= 157.5 && bearing < 202.5 - return t("geocoder.direction.north_east") if bearing >= 202.5 && bearing < 247.5 - return t("geocoder.direction.north") if bearing >= 247.5 && bearing < 292.5 - return t("geocoder.direction.north_west") if bearing >= 292.5 && bearing < 337.5 - t("geocoder.direction.west") - end - - def format_name(name) - name.gsub(/( *\[[^\]]*\])*$/, "") - end - - def count_results(results) - count = 0 - - results.each do |source| - count += source[:results].length if source[:results] - end - - count - end - def escape_query(query) - URI.escape(query, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]", false, 'N')) + CGI.escape(query) end def normalize_params - query = params[:query] - return unless query + if query = params[:query] + query.strip! - 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) - 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,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(/^([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) - 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] + end end + + params.permit(:query, :lat, :lon, :latlon_digits, :zoom, :minlat, :minlon, :maxlat, :maxlon) 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) + 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 } end @@ -368,11 +329,11 @@ class GeocoderController < ApplicationController 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) + 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 @@ -380,11 +341,11 @@ class GeocoderController < ApplicationController 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) + 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 } end