Merge remote-tracking branch 'upstream/pull/4960'

diff --git a/app/assets/javascripts/index/contextmenu.js b/app/assets/javascripts/index/contextmenu.js
index cac5e6fbf8c8c145d57f427a599d423c8a3de773..ffc0eadb771d24810ba21c2e1344d20484726f27 100644 (file)
--- a/app/assets/javascripts/index/contextmenu.js
+++ b/app/assets/javascripts/index/contextmenu.js
@@ -51,7 +51,7 @@ OSM.initializeContextMenu = function (map) {
           lat = latlng.lat.toFixed(precision),
           lng = latlng.lng.toFixed(precision);
 
-      OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(lat + "," + lng));
+      OSM.router.route("/search?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng));
     }
   });
 

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 94bb52a1be485b98cd6c8e87e208884f787d33fd..2f3882e3ae126e9486d7a9fd6929e0b182365102 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -33,10 +33,11 @@ OSM.Search = function (map) {
   $(".describe_location").on("click", function (e) {
     e.preventDefault();
     var center = map.getCenter().wrap(),
-        precision = OSM.zoomPrecision(map.getZoom());
-    OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(
-      center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
-    ));
+        precision = OSM.zoomPrecision(map.getZoom()),
+        lat = center.lat.toFixed(precision),
+        lng = center.lng.toFixed(precision);
+
+    OSM.router.route("/search?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng));
   });
 
   $("#sidebar_content")

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index ee3c3479c49bf260fb56d02db8fd4711d97f70ee..8ec0ab6b70acbb6c6e645e9a25229347ebfa0c9b 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -221,7 +221,7 @@ class GeocoderController < ApplicationController
       elsif latlon = query.match(%r{^([+-]?\d+(\.\d*)?)(?:\s+|\s*[,/]\s*)([+-]?\d+(\.\d*)?)$})
         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
 

diff --git a/app/views/application/_auth_providers.html.erb b/app/views/application/_auth_providers.html.erb
index be921ee9cfdf84bf837de36dae9a0d0614b5d973..66417bca2bde278331daf83e799aa5872524e2b4 100644 (file)
--- a/app/views/application/_auth_providers.html.erb
+++ b/app/views/application/_auth_providers.html.erb
@@ -26,7 +26,7 @@
     <% end %>
 
       <%= link_to image_tag("openid.svg",
-                            :alt => t("application.auth_providers.openid.title"),
+                            :alt => t("application.auth_providers.openid.alt"),
                             :size => "36"),
                   "#",
                   :id => "openid_open_url",

diff --git a/app/views/users/blocked.html.erb b/app/views/users/blocked.html.erb
index a97d9ba8d120b6660658a09931c756c8e6f01045..9776136a8e6c18b1dc5d289d7377346f16a22bc9 100644 (file)
--- a/app/views/users/blocked.html.erb
+++ b/app/views/users/blocked.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading_class, "p-0 mw-100" %>
 <% content_for :heading do %>
   <div class="header-illustration new-user-main auth-container mx-auto">
-    <ul class="nav nav-tabs position-absolute bottom-0 px-3 fs-6 w-100">
+    <ul class="nav nav-tabs position-absolute bottom-0 fs-6 w-100">
       <li class="nav-item">
         <%= link_to t("sessions.new.tab_title"), url_for(:action => :new, :controller => :sessions), :class => "nav-link" %>
       </li>