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

[rails.git] / app / assets / javascripts / leaflet.map.js

diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js
index 6537b0b233568ada1988c56d6c215789864a8f30..91d9efbde9c708999428a8f4d1355fb874d2b348 100644 (file)
--- a/app/assets/javascripts/leaflet.map.js
+++ b/app/assets/javascripts/leaflet.map.js
@@ -32,12 +32,17 @@ L.OSM.Map = L.Map.extend({
           layerOptions.apikey = OSM[value];
         } else if (property === "leafletOsmId") {
           layerConstructor = L.OSM[value];
           layerOptions.apikey = OSM[value];
         } else if (property === "leafletOsmId") {
           layerConstructor = L.OSM[value];

+        } else if (property === "leafletOsmDarkId" && OSM.isDarkMap() && L.OSM[value]) {
+          layerConstructor = L.OSM[value];

         } else {
           layerOptions[property] = value;
         }
       }
 
       const layer = new layerConstructor(layerOptions);
         } else {
           layerOptions[property] = value;
         }
       }
 
       const layer = new layerConstructor(layerOptions);

+      layer.on("add", () => {
+        this.fire("baselayerchange", { layer: layer });
+      });

       this.baseLayers.push(layer);
     }
 
       this.baseLayers.push(layer);
     }
 


@@ -51,8 +56,14 @@ L.OSM.Map = L.Map.extend({
       pane: "overlayPane",
       code: "G"
     });
       pane: "overlayPane",
       code: "G"
     });

+    this.gpsLayer.on("add", () => {
+      this.fire("overlayadd", { layer: this.gpsLayer });
+    }).on("remove", () => {
+      this.fire("overlayremove", { layer: this.gpsLayer });
+    });
+

 
 

-    this.on("layeradd", function (event) {
+    this.on("baselayerchange", function (event) {

       if (this.baseLayers.indexOf(event.layer) >= 0) {
         this.setMaxZoom(event.layer.options.maxZoom);
       }
       if (this.baseLayers.indexOf(event.layer) >= 0) {
         this.setMaxZoom(event.layer.options.maxZoom);
       }


@@ -104,19 +115,19 @@ L.OSM.Map = L.Map.extend({
   },
 
   updateLayers: function (layerParam) {
   },
 
   updateLayers: function (layerParam) {

-    var layers = layerParam || "M",
-        layersAdded = "";
-
-    for (var i = this.baseLayers.length - 1; i >= 0; i--) {
-      if (layers.indexOf(this.baseLayers[i].options.code) >= 0) {
-        this.addLayer(this.baseLayers[i]);
-        layersAdded = layersAdded + this.baseLayers[i].options.code;
-      } else if (i === 0 && layersAdded === "") {
-        this.addLayer(this.baseLayers[i]);
-      } else {
-        this.removeLayer(this.baseLayers[i]);
+    const oldBaseLayer = this.getMapBaseLayer();
+    let newBaseLayer;
+
+    for (const layer of this.baseLayers) {
+      if (!newBaseLayer || layerParam.includes(layer.options.code)) {
+        newBaseLayer = layer;

       }
     }
       }
     }

+
+    if (newBaseLayer !== oldBaseLayer) {
+      if (oldBaseLayer) this.removeLayer(oldBaseLayer);
+      if (newBaseLayer) this.addLayer(newBaseLayer);
+    }

   },
 
   getLayersCode: function () {
   },
 
   getLayersCode: function () {


@@ -141,13 +152,10 @@ L.OSM.Map = L.Map.extend({
   },
 
   getUrl: function (marker) {
   },
 
   getUrl: function (marker) {

-    var precision = OSM.zoomPrecision(this.getZoom()),
-        params = {};
+    const params = {};

 
     if (marker && this.hasLayer(marker)) {
 
     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 + "/",
     }
 
     var url = window.location.protocol + "//" + OSM.SERVER_URL + "/",


@@ -225,21 +233,14 @@ L.OSM.Map = L.Map.extend({
   },
 
   getGeoUri: function (marker) {
   },
 
   getGeoUri: function (marker) {

-    var precision = OSM.zoomPrecision(this.getZoom()),
-        latLng,
-        params = {};
+    let latLng = this.getCenter();
+    const zoom = this.getZoom();

 
     if (marker && this.hasLayer(marker)) {
 
     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) {
   },
 
   addObject: function (object, callback) {


@@ -267,7 +268,7 @@ L.OSM.Map = L.Map.extend({
 
     this.removeObject();
 
 
     this.removeObject();
 

-    if (object.type === "note") {
+    if (object.type === "note" || object.type === "changeset") {

       this._objectLoader = {
         abort: function () {}
       };
       this._objectLoader = {
         abort: function () {}
       };


@@ -275,23 +276,33 @@ L.OSM.Map = L.Map.extend({
       this._object = object;
       this._objectLayer = L.featureGroup().addTo(this);
 
       this._object = object;
       this._objectLayer = L.featureGroup().addTo(this);
 

-      L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);
+      if (object.type === "note") {
+        L.circleMarker(object.latLng, haloStyle).addTo(this._objectLayer);

 
 

-      if (object.icon) {
-        L.marker(object.latLng, {
-          icon: object.icon,
-          opacity: 1,
-          interactive: true
-        }).addTo(this._objectLayer);
+        if (object.icon) {
+          L.marker(object.latLng, {
+            icon: object.icon,
+            opacity: 1,
+            interactive: true
+          }).addTo(this._objectLayer);
+        }
+      } else if (object.type === "changeset") {
+        if (object.bbox) {
+          L.rectangle([
+            [object.bbox.minlat, object.bbox.minlon],
+            [object.bbox.maxlat, object.bbox.maxlon]
+          ], changesetStyle).addTo(this._objectLayer);
+        }

       }
 
       if (callback) callback(this._objectLayer.getBounds());
       }
 
       if (callback) callback(this._objectLayer.getBounds());

-    } else { // element or changeset handled by L.OSM.DataLayer
+      this.fire("overlayadd", { layer: this._objectLayer });
+    } else { // element handled by L.OSM.DataLayer

       var map = this;
       this._objectLoader = $.ajax({
         url: OSM.apiUrl(object),
       var map = this;
       this._objectLoader = $.ajax({
         url: OSM.apiUrl(object),

-        dataType: "xml",
-        success: function (xml) {
+        dataType: "json",
+        success: function (data) {

           map._object = object;
 
           map._objectLayer = new L.OSM.DataLayer(null, {
           map._object = object;
 
           map._objectLayer = new L.OSM.DataLayer(null, {


@@ -303,22 +314,21 @@ L.OSM.Map = L.Map.extend({
             }
           });
 
             }
           });
 

-          map._objectLayer.interestingNode = function (node, ways, relations) {
+          map._objectLayer.interestingNode = function (node, wayNodes, relationNodes) {

             if (object.type === "node") {
               return true;
             } else if (object.type === "relation") {
             if (object.type === "node") {
               return true;
             } else if (object.type === "relation") {

-              for (var i = 0; i < relations.length; i++) {
-                if (relations[i].members.indexOf(node) !== -1) return true;
-              }
+              return Boolean(relationNodes[node.id]);

             } else {
               return false;
             }
           };
 
             } else {
               return false;
             }
           };
 

-          map._objectLayer.addData(xml);
+          map._objectLayer.addData(data);

           map._objectLayer.addTo(map);
 
           if (callback) callback(map._objectLayer.getBounds());
           map._objectLayer.addTo(map);
 
           if (callback) callback(map._objectLayer.getBounds());

+          map.fire("overlayadd", { layer: map._objectLayer });

         }
       });
     }
         }
       });
     }


@@ -328,6 +338,7 @@ L.OSM.Map = L.Map.extend({
     this._object = null;
     if (this._objectLoader) this._objectLoader.abort();
     if (this._objectLayer) this.removeLayer(this._objectLayer);
     this._object = null;
     if (this._objectLoader) this._objectLoader.abort();
     if (this._objectLayer) this.removeLayer(this._objectLayer);

+    this.fire("overlayremove", { layer: this._objectLayer });

   },
 
   getState: function () {
   },
 
   getState: function () {


@@ -379,6 +390,14 @@ L.extend(L.Icon.Default.prototype, {
   }
 });
 
   }
 });
 

+OSM.isDarkMap = function () {
+  var mapTheme = $("body").attr("data-map-theme");
+  if (mapTheme) return mapTheme === "dark";
+  var siteTheme = $("html").attr("data-bs-theme");
+  if (siteTheme) return siteTheme === "dark";
+  return window.matchMedia("(prefers-color-scheme: dark)").matches;
+};
+

 OSM.getUserIcon = function (url) {
   return L.icon({
     iconUrl: url || OSM.MARKER_RED,
 OSM.getUserIcon = function (url) {
   return L.icon({
     iconUrl: url || OSM.MARKER_RED,