From 839d203d5121482e9bcd998749d410f541ce2f51 Mon Sep 17 00:00:00 2001 From: Nenad Vujicic Date: Thu, 13 Jun 2024 18:06:31 +0200 Subject: [PATCH 1/1] Added link to nominatim results in searching results Fixes #3205. Added caching of nominatim URL query parameters in sources global variable (as parameters parameter) in GeocoderController#search for both direct and reverse geocoding. In app/views/geocoder/search.html.erb added displaying cached URL as forwarding link when clicked on "OpenStreetMap Nominatim" label. Updated GeocoderControllerTest to check only name (latlng, osm_nominatim, osm_nominatim_reverse) parameter of new sources variable. --- app/controllers/geocoder_controller.rb | 51 ++++++++++++-------- app/views/geocoder/search.html.erb | 6 +-- test/controllers/geocoder_controller_test.rb | 8 +-- 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb index 912247c9c..0419fb3b8 100644 --- a/app/controllers/geocoder_controller.rb +++ b/app/controllers/geocoder_controller.rb @@ -13,10 +13,10 @@ class GeocoderController < ApplicationController @sources = [] if @params[:lat] && @params[:lon] - @sources.push "latlon" - @sources.push "osm_nominatim_reverse" + @sources.push({ :name => "latlon", :parameters => "" }) + @sources.push({ :name => "osm_nominatim_reverse", :parameters => "reverse?format=html&#{nominatim_reverse_url_parameters}" }) elsif @params[:query] - @sources.push "osm_nominatim" + @sources.push({ :name => "osm_nominatim", :parameters => "search?format=html&#{nominatim_url_parameters}" }) end if @sources.empty? @@ -71,21 +71,8 @@ class GeocoderController < ApplicationController 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("#{Settings.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&" + nominatim_url_parameters) # extract the results from the response results = response.elements["searchresults"] @@ -138,15 +125,13 @@ class GeocoderController < ApplicationController 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("#{Settings.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?" + nominatim_reverse_url_parameters) # parse the response response.elements.each("reversegeocode/result") do |result| @@ -171,6 +156,32 @@ class GeocoderController < ApplicationController private + def nominatim_url_parameters + # 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] + + "extratags=1&q=#{escape_query(query)}#{viewbox}#{exclude}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}" + end + + def nominatim_reverse_url_parameters + # get query parameters + lat = params[:lat] + lon = params[:lon] + zoom = params[:zoom] + + "lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{http_accept_language.user_preferred_languages.join(',')}" + end + def fetch_text(url) response = OSM.http_client.get(URI.parse(url)) diff --git a/app/views/geocoder/search.html.erb b/app/views/geocoder/search.html.erb index 86048b0ad..53e87b3fd 100644 --- a/app/views/geocoder/search.html.erb +++ b/app/views/geocoder/search.html.erb @@ -4,10 +4,10 @@ <% @sources.each do |source| %>

- <%= t(".title.results_from_html", :results_link => link_to(t(".title.#{source}"), - t(".title.#{source}_url"))) %> + <%= t(".title.results_from_html", :results_link => link_to(t(".title.#{source[:name]}"), + t(".title.#{source[:name]}_url").to_s + source[:parameters].to_s)) %>

-
"> +
">