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

diff --combined app/assets/javascripts/leaflet.map.js
index 10ce9471580b038c776c232c3a953c6d499c5559,c45761d4eb1dbd9cb59f0a61f03ec49ac9be1123..91d9efbde9c708999428a8f4d1355fb874d2b348
--- 1/app/assets/javascripts/leaflet.map.js
--- 2/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@@ -115,18 -115,19 +115,18 @@@ L.OSM.Map = L.Map.extend(
    },
  
    updateLayers: function (layerParam) {
 -    var layers = layerParam || "M";
 +    const oldBaseLayer = this.getMapBaseLayer();
 +    let newBaseLayer;
  
 -    for (let i = this.baseLayers.length - 1; i >= 0; i--) {
 -      if (layers.indexOf(this.baseLayers[i].options.code) === -1) {
 -        this.removeLayer(this.baseLayers[i]);
 +    for (const layer of this.baseLayers) {
 +      if (!newBaseLayer || layerParam.includes(layer.options.code)) {
 +        newBaseLayer = layer;
        }
      }
  
 -    for (let i = this.baseLayers.length - 1; i >= 0; i--) {
 -      if (layers.indexOf(this.baseLayers[i].options.code) >= 0 || i === 0) {
 -        this.addLayer(this.baseLayers[i]);
 -        return;
 -      }
 +    if (newBaseLayer !== oldBaseLayer) {
 +      if (oldBaseLayer) this.removeLayer(oldBaseLayer);
 +      if (newBaseLayer) this.addLayer(newBaseLayer);
      }
    },
  
@@@ -152,13 -153,10 +152,10 @@@
    },
  
    getUrl: function (marker) {
-     var precision = OSM.zoomPrecision(this.getZoom()),
-         params = {};
+     const params = {};
  
      if (marker && this.hasLayer(marker)) {
-       var latLng = marker.getLatLng().wrap();
-       params.mlat = latLng.lat.toFixed(precision);
-       params.mlon = latLng.lng.toFixed(precision);
+       [params.mlat, params.mlon] = OSM.cropLocation(marker.getLatLng(), this.getZoom());
      }
  
      var url = window.location.protocol + "//" + OSM.SERVER_URL + "/",
@@@ -236,21 -234,14 +233,14 @@@
    },
  
    getGeoUri: function (marker) {
-     var precision = OSM.zoomPrecision(this.getZoom()),
-         latLng,
-         params = {};
+     let latLng = this.getCenter();
+     const zoom = this.getZoom();
  
      if (marker && this.hasLayer(marker)) {
-       latLng = marker.getLatLng().wrap();
-     } else {
-       latLng = this.getCenter();
+       latLng = marker.getLatLng();
      }
  
-     params.lat = latLng.lat.toFixed(precision);
-     params.lon = latLng.lng.toFixed(precision);
-     params.zoom = this.getZoom();
- 
-     return "geo:" + params.lat + "," + params.lon + "?z=" + params.zoom;
+     return `geo:${OSM.cropLocation(latLng, zoom).join(",")}?z=${zoom}`;
    },
  
    addObject: function (object, callback) {