mobility-toolbox-js 3.0.0-beta.3 → 3.0.0-beta.5

package/mbt.js

@@ -20122,11 +20122,11 @@ uniform ${i3} ${s3} u_${a3};
   var removeDuplicate_default = removeDuplicate;
 
   // src/common/utils/getMapGlCopyrights.ts
-  var getMapGlCopyrights = (map2) => {
-    if (!map2) {
+  var getMapGlCopyrights = (map) => {
+    if (!map) {
       return [];
     }
-    const { style } = map2;
+    const { style } = map;
     if (!style) {
       return [];
     }
@@ -28737,9 +28737,9 @@ uniform ${i3} ${s3} u_${a3};
      */
     isVisible(view) {
       let frameState;
-      const map2 = this.getMapInternal();
-      if (!view && map2) {
-        view = map2.getView();
+      const map = this.getMapInternal();
+      if (!view && map) {
+        view = map.getView();
       }
       if (view instanceof View_default) {
         frameState = {
@@ -28749,8 +28749,8 @@ uniform ${i3} ${s3} u_${a3};
       } else {
         frameState = view;
       }
-      if (!frameState.layerStatesArray && map2) {
-        frameState.layerStatesArray = map2.getLayerGroup().getLayerStatesArray();
+      if (!frameState.layerStatesArray && map) {
+        frameState.layerStatesArray = map.getLayerGroup().getLayerStatesArray();
       }
       let layerState;
       if (frameState.layerStatesArray) {
@@ -28836,11 +28836,11 @@ uniform ${i3} ${s3} u_${a3};
      * For use inside the library only.
      * @param {import("../Map.js").default|null} map Map.
      */
-    setMapInternal(map2) {
-      if (!map2) {
+    setMapInternal(map) {
+      if (!map) {
         this.unrender();
       }
-      this.set(Property_default.MAP, map2);
+      this.set(Property_default.MAP, map);
     }
     /**
      * For use inside the library only.
@@ -28860,21 +28860,21 @@ uniform ${i3} ${s3} u_${a3};
      * @param {import("../Map.js").default|null} map Map.
      * @api
      */
-    setMap(map2) {
+    setMap(map) {
       if (this.mapPrecomposeKey_) {
         unlistenByKey(this.mapPrecomposeKey_);
         this.mapPrecomposeKey_ = null;
       }
-      if (!map2) {
+      if (!map) {
         this.changed();
       }
       if (this.mapRenderKey_) {
         unlistenByKey(this.mapRenderKey_);
         this.mapRenderKey_ = null;
       }
-      if (map2) {
+      if (map) {
         this.mapPrecomposeKey_ = listen(
-          map2,
+          map,
           EventType_default2.PRECOMPOSE,
           function(evt) {
             const renderEvent = (
@@ -28893,7 +28893,7 @@ uniform ${i3} ${s3} u_${a3};
           },
           this
         );
-        this.mapRenderKey_ = listen(this, EventType_default.CHANGE, map2.render, map2);
+        this.mapRenderKey_ = listen(this, EventType_default.CHANGE, map.render, map);
         this.changed();
       }
     }
@@ -29097,7 +29097,7 @@ uniform ${i3} ${s3} u_${a3};
      * @param {import("../Map.js").default|null} map Map.
      * @api
      */
-    setMap(map2) {
+    setMap(map) {
       if (this.map_) {
         removeNode(this.element);
       }
@@ -29105,16 +29105,16 @@ uniform ${i3} ${s3} u_${a3};
         unlistenByKey(this.listenerKeys[i]);
       }
       this.listenerKeys.length = 0;
-      this.map_ = map2;
-      if (map2) {
-        const target = this.target_ ? this.target_ : map2.getOverlayContainerStopEvent();
+      this.map_ = map;
+      if (map) {
+        const target = this.target_ ? this.target_ : map.getOverlayContainerStopEvent();
         target.appendChild(this.element);
         if (this.render !== VOID) {
           this.listenerKeys.push(
-            listen(map2, MapEventType_default.POSTRENDER, this.render, this)
+            listen(map, MapEventType_default.POSTRENDER, this.render, this)
           );
         }
-        map2.render();
+        map.render();
       }
     }
     /**
@@ -42508,8 +42508,8 @@ uniform ${i3} ${s3} u_${a3};
      * the map here.
      * @param {import("../Map.js").default|null} map Map.
      */
-    setMap(map2) {
-      this.map_ = map2;
+    setMap(map) {
+      this.map_ = map;
     }
   };
   var Interaction_default = Interaction;
@@ -42798,9 +42798,9 @@ uniform ${i3} ${s3} u_${a3};
           writer(feature2, geometry);
         }
       }
-      const map2 = this.getMap();
-      if (map2 && map2.isRendered() && this.getActive()) {
-        this.handlePointerAtPixel_(this.lastPixel_, map2);
+      const map = this.getMap();
+      if (map && map.isRendered() && this.getActive()) {
+        this.handlePointerAtPixel_(this.lastPixel_, map);
       }
       feature2.addEventListener(EventType_default.CHANGE, this.boundHandleFeatureChange_);
     }
@@ -42896,9 +42896,9 @@ uniform ${i3} ${s3} u_${a3};
      * the map here.
      * @param {import("../Map.js").default} map Map.
      */
-    setMap(map2) {
-      this.overlay_.setMap(map2);
-      super.setMap(map2);
+    setMap(map) {
+      this.overlay_.setMap(map);
+      super.setMap(map);
     }
     /**
      * Get the overlay layer that this interaction renders the modification point or vertex to.
@@ -43419,9 +43419,9 @@ uniform ${i3} ${s3} u_${a3};
      * @param {import("../coordinate.js").Coordinate} [coordinate] The pixel Coordinate.
      * @private
      */
-    handlePointerAtPixel_(pixel, map2, coordinate) {
-      const pixelCoordinate = coordinate || map2.getCoordinateFromPixel(pixel);
-      const projection = map2.getView().getProjection();
+    handlePointerAtPixel_(pixel, map, coordinate) {
+      const pixelCoordinate = coordinate || map.getCoordinateFromPixel(pixel);
+      const projection = map.getView().getProjection();
       const sortByDistance = function(a, b) {
         return projectedDistanceToSegmentDataSquared(pixelCoordinate, a, projection) - projectedDistanceToSegmentDataSquared(pixelCoordinate, b, projection);
       };
@@ -43429,7 +43429,7 @@ uniform ${i3} ${s3} u_${a3};
       let hitPointGeometry;
       if (this.hitDetection_) {
         const layerFilter = typeof this.hitDetection_ === "object" ? (layer) => layer === this.hitDetection_ : void 0;
-        map2.forEachFeatureAtPixel(
+        map.forEachFeatureAtPixel(
           pixel,
           (feature2, layer, geometry) => {
             if (geometry && geometry.getType() === "Point") {
@@ -43463,7 +43463,7 @@ uniform ${i3} ${s3} u_${a3};
           createOrUpdateFromCoordinate(pixelCoordinate, tempExtent),
           projection
         );
-        const buffer2 = map2.getView().getResolution() * this.pixelTolerance_;
+        const buffer2 = map.getView().getResolution() * this.pixelTolerance_;
         const box = toUserExtent(
           buffer(viewExtent, buffer2, tempExtent),
           projection
@@ -43474,7 +43474,7 @@ uniform ${i3} ${s3} u_${a3};
         const node = nodes.sort(sortByDistance)[0];
         const closestSegment = node.segment;
         let vertex = closestOnSegmentData(pixelCoordinate, node, projection);
-        const vertexPixel = map2.getPixelFromCoordinate(vertex);
+        const vertexPixel = map.getPixelFromCoordinate(vertex);
         let dist = distance(pixel, vertexPixel);
         if (hitPointGeometry || dist <= this.pixelTolerance_) {
           const vertexSegments = {};
@@ -43491,8 +43491,8 @@ uniform ${i3} ${s3} u_${a3};
               [node.geometry]
             );
           } else {
-            const pixel1 = map2.getPixelFromCoordinate(closestSegment[0]);
-            const pixel2 = map2.getPixelFromCoordinate(closestSegment[1]);
+            const pixel1 = map.getPixelFromCoordinate(closestSegment[0]);
+            const pixel2 = map.getPixelFromCoordinate(closestSegment[1]);
             const squaredDist1 = squaredDistance2(vertexPixel, pixel1);
             const squaredDist2 = squaredDistance2(vertexPixel, pixel2);
             dist = Math.sqrt(Math.min(squaredDist1, squaredDist2));
@@ -44808,8 +44808,8 @@ uniform ${i3} ${s3} u_${a3};
      *
      * @private
      */
-    static getGraphsResolutions(graphs, map2) {
-      const view = map2.getView();
+    static getGraphsResolutions(graphs, map) {
+      const view = map.getView();
       return graphs.map(([, minZoom, maxZoom]) => [
         view.getResolutionForZoom(minZoom),
         view.getResolutionForZoom(maxZoom || minZoom + 1)
@@ -45227,39 +45227,39 @@ uniform ${i3} ${s3} u_${a3};
         unByKey(this.onMapClickKey);
       }
     }
-    setMap(map2) {
-      super.setMap(map2);
-      if (map2 && this.active) {
+    setMap(map) {
+      super.setMap(map);
+      if (map && this.active) {
         this.activate();
-      } else if (!map2) {
+      } else if (!map) {
         this.active = false;
       }
     }
     activate() {
-      const map2 = this.getMap();
-      if (map2) {
+      const map = this.getMap();
+      if (map) {
         this.format = new GeoJSON_default({
-          featureProjection: map2.getView().getProjection()
+          featureProjection: map.getView().getProjection()
         });
         this.graphsResolutions = _RoutingControl.getGraphsResolutions(
           this.graphs,
-          map2
+          map
         );
         if (this.modifyInteraction) {
-          map2.removeInteraction(this.modifyInteraction);
+          map.removeInteraction(this.modifyInteraction);
         }
         if (this.modifyInteraction) {
-          map2.addInteraction(this.modifyInteraction);
+          map.addInteraction(this.modifyInteraction);
         }
         this.modifyInteraction?.setActive(this.modify);
         this.addListeners();
       }
     }
     deactivate() {
-      const map2 = this.getMap();
-      if (map2) {
+      const map = this.getMap();
+      if (map) {
         if (this.modifyInteraction) {
-          map2.removeInteraction(this.modifyInteraction);
+          map.removeInteraction(this.modifyInteraction);
         }
         this.removeListeners();
         this.reset();
@@ -45531,10 +45531,10 @@ uniform ${i3} ${s3} u_${a3};
       set visible(newValue) {
         this.setVisible(newValue);
       }
-      setMapInternal(map2) {
-        super.setMapInternal(map2);
-        if (map2) {
-          this.attachToMap(map2);
+      setMapInternal(map) {
+        super.setMapInternal(map);
+        if (map) {
+          this.attachToMap(map);
         } else {
           this.detachFromMap();
         }
@@ -45585,11 +45585,11 @@ uniform ${i3} ${s3} u_${a3};
        *
        * @param {ol/Map~Map} map A map.
        */
-      attachToMap(map2) {
+      attachToMap(map) {
         (super.attachToMap || (() => {
-        }))(map2);
+        }))(map);
         (this.get("children") || []).forEach((child) => {
-          map2.addLayer(child);
+          map.addLayer(child);
         });
       }
       /**
@@ -45600,7 +45600,7 @@ uniform ${i3} ${s3} u_${a3};
           this.map.removeLayer(child);
         });
         (super.detachFromMap || (() => {
-        }))(map);
+        }))();
       }
       /**
        * Return the an array containing all the descendants of the layer in a flat array. Including the current layer.
@@ -45680,8 +45680,8 @@ uniform ${i3} ${s3} u_${a3};
      * Initialize the layer and listen to feature clicks.
      * @param {ol/Map~Map} map
      */
-    attachToMap(map2) {
-      super.attachToMap(map2);
+    attachToMap(map) {
+      super.attachToMap(map);
       this.loadMbMap();
       const updateMbMapDebounced = (0, import_lodash.default)(this.updateMbMap.bind(this), 150);
       this.olListenersKeys.push(
@@ -45775,9 +45775,9 @@ uniform ${i3} ${s3} u_${a3};
         return [];
       }
       const layer = this.getLayer();
-      const map2 = layer.getMapInternal();
+      const map = layer.getMapInternal();
       const { mbMap } = layer;
-      const projection = map2?.getView()?.getProjection()?.getCode() || "EPSG:3857";
+      const projection = map?.getView()?.getProjection()?.getCode() || "EPSG:3857";
       let features = [];
       if (!formats[projection]) {
         formats[projection] = new GeoJSON_default({
@@ -45820,8 +45820,8 @@ uniform ${i3} ${s3} u_${a3};
     }
     renderFrame(frameState) {
       const layer = this.getLayer();
-      const { map: map2, mbMap } = layer;
-      if (!layer || !map2 || !mbMap) {
+      const { map, mbMap } = layer;
+      if (!layer || !map || !mbMap) {
         return null;
       }
       const canvas2 = mbMap.getCanvas();
@@ -45834,7 +45834,7 @@ uniform ${i3} ${s3} u_${a3};
         bearing: toDegrees(-viewState.rotation)
       });
       if (!canvas2.isConnected) {
-        map2.render();
+        map.render();
       } else if (canvas2.width !== frameState.size[0] || canvas2.height !== frameState.size[1]) {
         mbMap.resize();
       }
@@ -45911,9 +45911,9 @@ uniform ${i3} ${s3} u_${a3};
         return [];
       }
       const layer = this.getLayer();
-      const map2 = layer.getMapInternal();
+      const map = layer.getMapInternal();
       const { maplibreMap } = layer.maplibreLayer;
-      const projection = map2?.getView()?.getProjection()?.getCode() || "EPSG:3857";
+      const projection = map?.getView()?.getProjection()?.getCode() || "EPSG:3857";
       let features = [];
       if (!formats2[projection]) {
         formats2[projection] = new GeoJSON_default({
@@ -46078,27 +46078,29 @@ uniform ${i3} ${s3} u_${a3};
      * @param {ol/Map~Map} map the Maplibre map.
      * @override
      */
-    attachToMap(map2) {
+    attachToMap(map) {
       if (this.maplibreLayer && !this.maplibreLayer.map) {
-        map2.addLayer(this.maplibreLayer);
+        map.addLayer(this.maplibreLayer);
       }
-      super.attachToMap(map2);
+      super.attachToMap(map);
       if (!this.map || !this.maplibreLayer) {
         return;
       }
-      const { maplibreMap } = this.maplibreLayer;
-      if (!maplibreMap) {
+      if (!this.map.getTargetElement()) {
         this.olListenersKeys.push(
           this.map.on("change:target", () => {
-            this.attachToMap(map2);
+            this.attachToMap(map);
           })
         );
         return;
       }
-      if (maplibreMap.loaded()) {
-        this.onLoad();
-      } else {
-        maplibreMap.once("load", this.onLoad);
+      const { maplibreMap } = this.maplibreLayer;
+      if (maplibreMap) {
+        if (maplibreMap.loaded()) {
+          this.onLoad();
+        } else {
+          maplibreMap.once("load", this.onLoad);
+        }
       }
       this.olListenersKeys.push(
         // @ts-expect-error 'load' is a custom event form mobility-toolbox-js
@@ -46109,7 +46111,7 @@ uniform ${i3} ${s3} u_${a3};
         this.on("propertychange", (evt) => {
           if (/(sources|layers|layersFilter|maplibreLayer|beforeId|)/.test(evt.key)) {
             this.detachFromMap();
-            this.attachToMap(map2);
+            this.attachToMap(map);
           }
         })
       );
@@ -46628,8 +46630,8 @@ uniform ${i3} ${s3} u_${a3};
           // },
         });
       }
-      attachToMap(map2) {
-        super.attachToMap(map2);
+      attachToMap(map) {
+        super.attachToMap(map);
         document.addEventListener(
           "visibilitychange",
           this.onDocumentVisibilityChange
@@ -47333,8 +47335,8 @@ uniform ${i3} ${s3} u_${a3};
         return [];
       }
       const layer = this.getLayer();
-      const map2 = layer.getMapInternal();
-      const resolution = map2.getView().getResolution();
+      const map = layer.getMapInternal();
+      const resolution = map.getView().getResolution();
       const nb = 10;
       const ext = buffer(
         [...coordinate, ...coordinate],
@@ -47410,8 +47412,8 @@ uniform ${i3} ${s3} u_${a3};
       return new RealtimeLayerRenderer(this);
     }
     /** @private */
-    attachToMap(map2) {
-      super.attachToMap(map2);
+    attachToMap(map) {
+      super.attachToMap(map);
       if (this.map) {
         if (this.visible) {
           this.start();
@@ -47672,8 +47674,8 @@ uniform ${i3} ${s3} u_${a3};
     abortControllers = {};
     const flatLayers = getLayersAsFlatArray_default(layers);
     const promises = flatLayers.map((layer) => {
-      const map2 = layer.getMapInternal();
-      const projection = map2?.getView()?.getProjection()?.getCode();
+      const map = layer.getMapInternal();
+      const projection = map?.getView()?.getProjection()?.getCode();
       const emptyResponse = { features: [], layer, coordinate };
       if (!projection) {
         return Promise.resolve(emptyResponse);
@@ -47686,7 +47688,7 @@ uniform ${i3} ${s3} u_${a3};
         const id = getUid(void 0);
         abortControllers[id]?.abort();
         abortControllers[id] = new AbortController();
-        const resolution = map2?.getView()?.getResolution();
+        const resolution = map?.getView()?.getResolution();
         return getFeaturesFromWMS(
           source,
           {
@@ -47713,11 +47715,11 @@ uniform ${i3} ${s3} u_${a3};
           };
         });
       }
-      const pixel = map2?.getPixelFromCoordinate(coordinate);
+      const pixel = map?.getPixelFromCoordinate(coordinate);
       if (!pixel) {
         return Promise.resolve(emptyResponse);
       }
-      const features = map2?.getFeaturesAtPixel(pixel, {
+      const features = map?.getFeaturesAtPixel(pixel, {
         layerFilter: (l) => l === layer,
         hitTolerance: (
           // @ts-ignore
@@ -47780,8 +47782,8 @@ uniform ${i3} ${s3} u_${a3};
     constructor(options = {}) {
       this.options = options;
     }
-    onAdd(map2) {
-      this.map = map2;
+    onAdd(map) {
+      this.map = map;
       if (!this.container) {
         this.container = document.createElement("div");
       }
@@ -47884,10 +47886,10 @@ uniform ${i3} ${s3} u_${a3};
       this.type = "custom";
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    onAdd(map2, gl) {
-      this.map = map2;
+    onAdd(map, gl) {
+      this.map = map;
     }
-    onRemove(map2, gl) {
+    onRemove(map, gl) {
       this.map = void 0;
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -48400,15 +48402,15 @@ uniform ${i3} ${s3} u_${a3};
   var es_default6 = transformRotate;
 
   // src/maplibre/utils/getSourceCoordinates.ts
-  var getSourceCoordinates = (map2, pixelRatio = 1) => {
-    const { width, height } = map2.getCanvas();
-    const leftTop = map2.unproject({ x: 0, y: 0 });
-    const leftBottom = map2.unproject({ x: 0, y: height / pixelRatio });
-    const rightBottom = map2.unproject({
+  var getSourceCoordinates = (map, pixelRatio = 1) => {
+    const { width, height } = map.getCanvas();
+    const leftTop = map.unproject({ x: 0, y: 0 });
+    const leftBottom = map.unproject({ x: 0, y: height / pixelRatio });
+    const rightBottom = map.unproject({
       x: width / pixelRatio,
       y: height / pixelRatio
     });
-    const rightTop = map2.unproject({ x: width / pixelRatio, y: 0 });
+    const rightTop = map.unproject({ x: width / pixelRatio, y: 0 });
     return [
       [leftTop.lng, leftTop.lat],
       [rightTop.lng, rightTop.lat],
@@ -48419,12 +48421,12 @@ uniform ${i3} ${s3} u_${a3};
   var getSourceCoordinates_default = getSourceCoordinates;
 
   // src/maplibre/utils/getMercatorResolution.ts
-  var getMercatorResolution = (map2) => {
-    const bounds = map2.getBounds().toArray();
+  var getMercatorResolution = (map) => {
+    const bounds = map.getBounds().toArray();
     const a = fromLonLat(bounds[0]);
     const b = fromLonLat(bounds[1]);
     const extent = [...a, ...b];
-    const { width, height } = map2.getCanvas();
+    const { width, height } = map.getCanvas();
     const xResolution = getWidth(extent) / width;
     const yResolution = getHeight(extent) / height;
     return Math.max(xResolution, yResolution);
@@ -48491,25 +48493,25 @@ uniform ${i3} ${s3} u_${a3};
     /**
      * Add sources, layers and listeners to the map.
      */
-    onAdd(map2, gl) {
-      super.onAdd(map2, gl);
-      if (map2.isStyleLoaded()) {
+    onAdd(map, gl) {
+      super.onAdd(map, gl);
+      if (map.isStyleLoaded()) {
         this.onLoad();
       }
-      map2.on("load", this.onLoad);
+      map.on("load", this.onLoad);
     }
     /**
      * Remove source, layers and listeners from the map.
      */
-    onRemove(map2, gl) {
-      map2.off("load", this.onLoad);
-      if (map2.getLayer(this.layer.id)) {
-        map2.removeLayer(this.layer.id);
+    onRemove(map, gl) {
+      map.off("load", this.onLoad);
+      if (map.getLayer(this.layer.id)) {
+        map.removeLayer(this.layer.id);
       }
-      if (map2.getSource(this.id)) {
-        map2.removeSource(this.id);
+      if (map.getSource(this.id)) {
+        map.removeSource(this.id);
       }
-      super.onRemove(map2, gl);
+      super.onRemove(map, gl);
     }
     onLoad() {
       if (!this.map.getSource(this.id)) {