cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove "whereami" search parameter, use "lat" and "lon" instead

Browse source
This commit is contained in:
Anton Khorev 2024-07-06 16:56:49 +03:00
parent e3c9192758
commit 0d2010cd2f
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/index/contextmenu.js
View file

@ -51,7 +51,7 @@ OSM.initializeContextMenu = function (map) {
lat = latlng.lat.toFixed(precision), lat = latlng.lat.toFixed(precision),
lng = latlng.lng.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));
} }
}); });

9
app/assets/javascripts/index/search.js
View file

@ -33,10 +33,11 @@ OSM.Search = function (map) {
$(".describe_location").on("click", function (e) { $(".describe_location").on("click", function (e) {
e.preventDefault(); e.preventDefault();
var center = map.getCenter().wrap(), var center = map.getCenter().wrap(),
precision = OSM.zoomPrecision(map.getZoom()); precision = OSM.zoomPrecision(map.getZoom()),
OSM.router.route("/search?whereami=1&query=" + encodeURIComponent( lat = center.lat.toFixed(precision),
center.lat.toFixed(precision) + "," + center.lng.toFixed(precision) lng = center.lng.toFixed(precision);
));
OSM.router.route("/search?lat=" + encodeURIComponent(lat) + "&lon=" + encodeURIComponent(lng));
}); });
$("#sidebar_content") $("#sidebar_content")

2
app/controllers/geocoder_controller.rb
View file

@ -221,7 +221,7 @@ class GeocoderController < ApplicationController
elsif latlon = query.match(%r{^([+-]?\d+(\.\d*)?)(?:\s+|\s*[,/]\s*)([+-]?\d+(\.\d*)?)$}) 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.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
end end