namazu-ts 1.2.9 → 1.2.11

package/dist/browser/index.js

@@ -20757,8 +20757,10 @@ class SismoMap {
   _debug = false;
   _showDescription = true;
   _lang;
+  _legendClasses;
   constructor(name, map, lang, legendClasses, bounds) {
     this._lang = lang;
+    this._legendClasses = legendClasses;
     this._descPopups = [];
     const descPopup = new vA({
       closeButton: false,
@@ -20778,19 +20780,12 @@ class SismoMap {
       }
     });
     this.map = map;
-    const scale = new cA;
     const zoomC = new Yk({
       showZoom: true,
       showCompass: false
     });
     map.addControl(zoomC);
     this._zoomElem = zoomC._container;
-    map.addControl(scale);
-    scale._container.style.display = "none";
-    scale._container.id = "scale";
-    this.addMagLegend(legendClasses);
-    this.addContourLegend(lang, legendClasses);
-    this.addIntensityLegend(lang, legendClasses);
     map.dragRotate.disable();
     map.once("load", () => {
       if (bounds !== undefined) {
@@ -21055,6 +21050,13 @@ class SismoMap {
   showZoom(enabled) {
     this._zoomElem.style.display = enabled ? "block" : "none";
   }
+  exec(func) {
+    if (this.map.loaded() || this._usable) {
+      func();
+    } else {
+      this.map.once("load", () => func());
+    }
+  }
   stopSpin() {
     this._spinEnabled = false;
     this.map.stop();
@@ -21241,29 +21243,24 @@ class SismoMap {
     clear,
     displayCallback
   }) {
-    function display(map) {
+    this.exec(() => {
       if (sourceName === "stations" /* STATIONS */) {
-        map.map.setLayoutProperty("stations" /* STATIONS */, "visibility", "visible");
+        this.map.setLayoutProperty("stations" /* STATIONS */, "visibility", "visible");
       }
       if (sourceName === "events" /* EVENTS */) {}
       if (clear) {
-        map.clear();
+        this.clear();
       }
       if (geojson.features.length === 0)
         return;
       if (displayCallback) {
         displayCallback();
       }
-      map.updateSource(sourceName, geojson);
+      this.updateSource(sourceName, geojson);
       if (moveView) {
-        map.centerView(geojson);
+        this.centerView(geojson);
       }
-    }
-    if (this.map.loaded() || this._usable) {
-      display(this);
-    } else {
-      this.map.once("load", () => display(this));
-    }
+    });
   }
   spinGlobe() {
     if (!this._userInteracting && this._spinEnabled && this.map.getZoom() < this._maxSpinZoom) {
@@ -21273,45 +21270,50 @@ class SismoMap {
     }
   }
   showScale(enabled) {
-    function handle() {
-      const legend = document.getElementById("scale");
-      if (legend != null) {
-        legend.style.display = enabled ? "block" : "none";
+    this.exec(() => {
+      let legend = document.getElementById("scale");
+      if (!legend) {
+        legend = this.addScale();
       }
-    }
-    if (this.map.loaded() || this._usable) {
-      handle();
-    } else {
-      this.map.once("load", handle);
-    }
+      legend.style.display = enabled ? "block" : "none";
+    });
   }
   showMagLegend(enabled) {
-    function handle() {
-      const legend = document.getElementById("maglegend");
-      if (legend != null) {
-        legend.style.display = enabled ? "block" : "none";
+    this.exec(() => {
+      let legend = document.getElementById("maglegend");
+      if (!legend) {
+        const container = this.addMagLegend(this._legendClasses);
+        if (container.isOk()) {
+          legend = container.value;
+        } else {
+          console.error(container.error);
+          return;
+        }
       }
-    }
-    if (this.map.loaded() || this._usable) {
-      handle();
-    } else {
-      this.map.once("load", handle);
-    }
+      legend.style.display = enabled ? "block" : "none";
+    });
   }
   showContourLegend(type) {
     if (type === "intensity" /* INTENSITY */) {
       this.showIntensityLegend(true);
       return;
     }
-    function handle(map) {
-      const legend = document.getElementById("contlegend");
-      if (legend != null) {
-        legend.style.display = type === false ? "none" : "block";
+    this.exec(() => {
+      let legend = document.getElementById("contlegend");
+      if (!legend) {
+        const container = this.addContourLegend(this._lang, this._legendClasses);
+        if (container.isOk()) {
+          legend = container.value;
+        } else {
+          console.error(container.error);
+          return;
+        }
       }
+      legend.style.display = type === false ? "none" : "block";
       if (!type)
         return;
       const titles = { fr: `Intensités ${type.toUpperCase()}`, en: `${type.toUpperCase()} intensities` };
-      document.getElementById("contour_title").textContent = titles[map._lang];
+      document.getElementById("contour_title").textContent = titles[this._lang];
       const texts = [
         { level: "I", pga: "<0.02", pgv: "<0.07", psa0p3: "<0.010", psa1p0: "<0.001", psa3p0: "<0.0008" },
         { level: "II", pga: "0.07", pgv: "0.03", psa0p3: "0.05", psa1p0: "0.009", psa3p0: "0.005" },
@@ -21335,25 +21337,22 @@ class SismoMap {
           continue;
         elem.textContent = text.level + " : " + text[type];
       }
-    }
-    if (this.map.loaded() || this._usable) {
-      handle(this);
-    } else {
-      this.map.once("load", () => handle(this));
-    }
+    });
   }
   showIntensityLegend(enabled) {
-    function handle() {
-      const legend = document.getElementById("intlegend");
-      if (legend != null) {
-        legend.style.display = enabled ? "block" : "none";
+    this.exec(() => {
+      let legend = document.getElementById("intlegend");
+      if (!legend) {
+        const container = this.addIntensityLegend(this._lang, this._legendClasses);
+        if (container.isOk()) {
+          legend = container.value;
+        } else {
+          console.error(container.error);
+          return;
+        }
       }
-    }
-    if (this.map.loaded() || this._usable) {
-      handle();
-    } else {
-      this.map.once("load", handle);
-    }
+      legend.style.display = enabled ? "block" : "none";
+    });
   }
   addContourLegend(lang, classes) {
 
@@ -21403,7 +21402,16 @@ class SismoMap {
         this._map = undefined;
       }
     }
-    this.map.addControl(new ContourLegend, "bottom-right");
+    const contourLegend = new ContourLegend;
+    this.map.addControl(contourLegend, "bottom-right");
+    return contourLegend._container !== undefined ? ok(contourLegend._container) : err(new Error("Container not present"));
+  }
+  addScale() {
+    const scale = new cA;
+    this.map.addControl(scale);
+    scale._container.style.display = "none";
+    scale._container.id = "scale";
+    return scale._container;
   }
   addMagLegend(classes) {
 
@@ -21449,7 +21457,9 @@ class SismoMap {
         this._map = undefined;
       }
     }
-    this.map.addControl(new MagnitudeLegend, "bottom-right");
+    const magnitudeLegend = new MagnitudeLegend;
+    this.map.addControl(magnitudeLegend, "bottom-right");
+    return magnitudeLegend._container !== undefined ? ok(magnitudeLegend._container) : err(new Error("Container not present"));
   }
   addIntensityLegend(locale, classes) {
 
@@ -21497,7 +21507,9 @@ class SismoMap {
         this._map = undefined;
       }
     }
-    this.map.addControl(new IntensityLegend, "bottom-right");
+    const intensityLegend = new IntensityLegend;
+    this.map.addControl(intensityLegend, "bottom-right");
+    return intensityLegend._container !== undefined ? ok(intensityLegend._container) : err(new Error("Container not present"));
   }
   applyFilter(filterQuery) {
     if (filterQuery.magnitudes.length === 0 && filterQuery.events.length === 0) {
@@ -21551,14 +21563,14 @@ class SismoMap {
     linkOpacity = 1,
     linkWidth = 6
   }) {
-    async function display(map) {
-      const eventsrc = map.map.getSource("events" /* EVENTS */);
+    this.exec(async () => {
+      const eventsrc = this.map.getSource("events" /* EVENTS */);
       if (eventsrc === undefined) {
         console.error("Event source inexistent ?");
         return;
       }
       const src = await eventsrc.getData();
-      const statSrc = map.map.getSource("stations" /* STATIONS */);
+      const statSrc = this.map.getSource("stations" /* STATIONS */);
       const geojson = await statSrc.getData();
       const stationsGeoJSON = geojson;
       let station;
@@ -21568,20 +21580,20 @@ class SismoMap {
           break;
         }
       }
-      map.map.setPaintProperty("ligne" /* LINE */, "line-color", linkColor);
-      map.map.setPaintProperty("ligne" /* LINE */, "line-opacity", linkOpacity);
-      map.map.setPaintProperty("ligne" /* LINE */, "line-width", linkWidth);
+      this.map.setPaintProperty("ligne" /* LINE */, "line-color", linkColor);
+      this.map.setPaintProperty("ligne" /* LINE */, "line-opacity", linkOpacity);
+      this.map.setPaintProperty("ligne" /* LINE */, "line-width", linkWidth);
       if (station === undefined) {
-        if (map._debug) {
+        if (this._debug) {
           console.log("no stations with code " + phase.stationCode);
         }
         return Promise.resolve();
       }
       const event = src.features[0];
-      map._descPopups[1].setLngLat(station.geometry.coordinates).setText(popupString).addTo(map.map);
-      map._descPopups[1].getElement().style.color = "black";
-      map._descPopups[1].getElement().style.pointerEvents = "none !important";
-      map._descPopups[1].getElement().querySelectorAll("*").forEach((el2) => {
+      this._descPopups[1].setLngLat(station.geometry.coordinates).setText(popupString).addTo(this.map);
+      this._descPopups[1].getElement().style.color = "black";
+      this._descPopups[1].getElement().style.pointerEvents = "none !important";
+      this._descPopups[1].getElement().querySelectorAll("*").forEach((el2) => {
         el2.style.pointerEvents = "none";
       });
       const newData = {
@@ -21595,13 +21607,8 @@ class SismoMap {
           ]
         }
       };
-      map.map.getSource("ligne" /* LINE */)?.setData(newData);
-    }
-    if (this.map.loaded() || this._usable) {
-      display(this);
-    } else {
-      this.map.once("load", () => display(this));
-    }
+      this.map.getSource("ligne" /* LINE */)?.setData(newData);
+    });
   }
   displayRect({
     minlng,
@@ -21649,7 +21656,7 @@ class SismoMap {
       "place_village",
       "place_city_capital"
     ];
-    this.map.once("load", () => {
+    this.exec(() => {
       layersToChange.forEach((layer) => {
         this.map.setLayoutProperty(layer, "text-field", [
           "get",
@@ -21658,13 +21665,6 @@ class SismoMap {
       });
     });
   }
-  async getEventNumber() {
-    const source = this.map.getSource("events" /* EVENTS */);
-    if (source === undefined)
-      return Promise.reject(-1);
-    const sourceData = await source.getData();
-    return sourceData.features.length;
-  }
 }
 export {
   isEventGeoJSONProperties,

package/dist/node/index.js

@@ -33865,8 +33865,10 @@ class SismoMap {
   _debug = false;
   _showDescription = true;
   _lang;
+  _legendClasses;
   constructor(name, map, lang, legendClasses, bounds) {
     this._lang = lang;
+    this._legendClasses = legendClasses;
     this._descPopups = [];
     const descPopup = new vA({
       closeButton: false,
@@ -33886,19 +33888,12 @@ class SismoMap {
       }
     });
     this.map = map;
-    const scale = new cA;
     const zoomC = new Yk({
       showZoom: true,
       showCompass: false
     });
     map.addControl(zoomC);
     this._zoomElem = zoomC._container;
-    map.addControl(scale);
-    scale._container.style.display = "none";
-    scale._container.id = "scale";
-    this.addMagLegend(legendClasses);
-    this.addContourLegend(lang, legendClasses);
-    this.addIntensityLegend(lang, legendClasses);
     map.dragRotate.disable();
     map.once("load", () => {
       if (bounds !== undefined) {
@@ -34163,6 +34158,13 @@ class SismoMap {
   showZoom(enabled) {
     this._zoomElem.style.display = enabled ? "block" : "none";
   }
+  exec(func) {
+    if (this.map.loaded() || this._usable) {
+      func();
+    } else {
+      this.map.once("load", () => func());
+    }
+  }
   stopSpin() {
     this._spinEnabled = false;
     this.map.stop();
@@ -34349,29 +34351,24 @@ class SismoMap {
     clear,
     displayCallback
   }) {
-    function display(map) {
+    this.exec(() => {
       if (sourceName === "stations" /* STATIONS */) {
-        map.map.setLayoutProperty("stations" /* STATIONS */, "visibility", "visible");
+        this.map.setLayoutProperty("stations" /* STATIONS */, "visibility", "visible");
       }
       if (sourceName === "events" /* EVENTS */) {}
       if (clear) {
-        map.clear();
+        this.clear();
       }
       if (geojson.features.length === 0)
         return;
       if (displayCallback) {
         displayCallback();
       }
-      map.updateSource(sourceName, geojson);
+      this.updateSource(sourceName, geojson);
       if (moveView) {
-        map.centerView(geojson);
+        this.centerView(geojson);
       }
-    }
-    if (this.map.loaded() || this._usable) {
-      display(this);
-    } else {
-      this.map.once("load", () => display(this));
-    }
+    });
   }
   spinGlobe() {
     if (!this._userInteracting && this._spinEnabled && this.map.getZoom() < this._maxSpinZoom) {
@@ -34381,45 +34378,50 @@ class SismoMap {
     }
   }
   showScale(enabled) {
-    function handle() {
-      const legend = document.getElementById("scale");
-      if (legend != null) {
-        legend.style.display = enabled ? "block" : "none";
+    this.exec(() => {
+      let legend = document.getElementById("scale");
+      if (!legend) {
+        legend = this.addScale();
       }
-    }
-    if (this.map.loaded() || this._usable) {
-      handle();
-    } else {
-      this.map.once("load", handle);
-    }
+      legend.style.display = enabled ? "block" : "none";
+    });
   }
   showMagLegend(enabled) {
-    function handle() {
-      const legend = document.getElementById("maglegend");
-      if (legend != null) {
-        legend.style.display = enabled ? "block" : "none";
+    this.exec(() => {
+      let legend = document.getElementById("maglegend");
+      if (!legend) {
+        const container = this.addMagLegend(this._legendClasses);
+        if (container.isOk()) {
+          legend = container.value;
+        } else {
+          console.error(container.error);
+          return;
+        }
       }
-    }
-    if (this.map.loaded() || this._usable) {
-      handle();
-    } else {
-      this.map.once("load", handle);
-    }
+      legend.style.display = enabled ? "block" : "none";
+    });
   }
   showContourLegend(type) {
     if (type === "intensity" /* INTENSITY */) {
       this.showIntensityLegend(true);
       return;
     }
-    function handle(map) {
-      const legend = document.getElementById("contlegend");
-      if (legend != null) {
-        legend.style.display = type === false ? "none" : "block";
+    this.exec(() => {
+      let legend = document.getElementById("contlegend");
+      if (!legend) {
+        const container = this.addContourLegend(this._lang, this._legendClasses);
+        if (container.isOk()) {
+          legend = container.value;
+        } else {
+          console.error(container.error);
+          return;
+        }
       }
+      legend.style.display = type === false ? "none" : "block";
       if (!type)
         return;
       const titles = { fr: `Intensités ${type.toUpperCase()}`, en: `${type.toUpperCase()} intensities` };
-      document.getElementById("contour_title").textContent = titles[map._lang];
+      document.getElementById("contour_title").textContent = titles[this._lang];
       const texts = [
         { level: "I", pga: "<0.02", pgv: "<0.07", psa0p3: "<0.010", psa1p0: "<0.001", psa3p0: "<0.0008" },
         { level: "II", pga: "0.07", pgv: "0.03", psa0p3: "0.05", psa1p0: "0.009", psa3p0: "0.005" },
@@ -34443,25 +34445,22 @@ class SismoMap {
           continue;
         elem.textContent = text.level + " : " + text[type];
       }
-    }
-    if (this.map.loaded() || this._usable) {
-      handle(this);
-    } else {
-      this.map.once("load", () => handle(this));
-    }
+    });
   }
   showIntensityLegend(enabled) {
-    function handle() {
-      const legend = document.getElementById("intlegend");
-      if (legend != null) {
-        legend.style.display = enabled ? "block" : "none";
+    this.exec(() => {
+      let legend = document.getElementById("intlegend");
+      if (!legend) {
+        const container = this.addIntensityLegend(this._lang, this._legendClasses);
+        if (container.isOk()) {
+          legend = container.value;
+        } else {
+          console.error(container.error);
+          return;
+        }
       }
-    }
-    if (this.map.loaded() || this._usable) {
-      handle();
-    } else {
-      this.map.once("load", handle);
-    }
+      legend.style.display = enabled ? "block" : "none";
+    });
   }
   addContourLegend(lang, classes) {
 
@@ -34511,7 +34510,16 @@ class SismoMap {
         this._map = undefined;
       }
     }
-    this.map.addControl(new ContourLegend, "bottom-right");
+    const contourLegend = new ContourLegend;
+    this.map.addControl(contourLegend, "bottom-right");
+    return contourLegend._container !== undefined ? $ok(contourLegend._container) : $err(new Error("Container not present"));
+  }
+  addScale() {
+    const scale = new cA;
+    this.map.addControl(scale);
+    scale._container.style.display = "none";
+    scale._container.id = "scale";
+    return scale._container;
   }
   addMagLegend(classes) {
 
@@ -34557,7 +34565,9 @@ class SismoMap {
         this._map = undefined;
       }
     }
-    this.map.addControl(new MagnitudeLegend, "bottom-right");
+    const magnitudeLegend = new MagnitudeLegend;
+    this.map.addControl(magnitudeLegend, "bottom-right");
+    return magnitudeLegend._container !== undefined ? $ok(magnitudeLegend._container) : $err(new Error("Container not present"));
   }
   addIntensityLegend(locale, classes) {
 
@@ -34605,7 +34615,9 @@ class SismoMap {
         this._map = undefined;
       }
     }
-    this.map.addControl(new IntensityLegend, "bottom-right");
+    const intensityLegend = new IntensityLegend;
+    this.map.addControl(intensityLegend, "bottom-right");
+    return intensityLegend._container !== undefined ? $ok(intensityLegend._container) : $err(new Error("Container not present"));
   }
   applyFilter(filterQuery) {
     if (filterQuery.magnitudes.length === 0 && filterQuery.events.length === 0) {
@@ -34659,14 +34671,14 @@ class SismoMap {
     linkOpacity = 1,
     linkWidth = 6
   }) {
-    async function display(map) {
-      const eventsrc = map.map.getSource("events" /* EVENTS */);
+    this.exec(async () => {
+      const eventsrc = this.map.getSource("events" /* EVENTS */);
       if (eventsrc === undefined) {
         console.error("Event source inexistent ?");
         return;
       }
       const src = await eventsrc.getData();
-      const statSrc = map.map.getSource("stations" /* STATIONS */);
+      const statSrc = this.map.getSource("stations" /* STATIONS */);
       const geojson = await statSrc.getData();
       const stationsGeoJSON = geojson;
       let station;
@@ -34676,20 +34688,20 @@ class SismoMap {
           break;
         }
       }
-      map.map.setPaintProperty("ligne" /* LINE */, "line-color", linkColor);
-      map.map.setPaintProperty("ligne" /* LINE */, "line-opacity", linkOpacity);
-      map.map.setPaintProperty("ligne" /* LINE */, "line-width", linkWidth);
+      this.map.setPaintProperty("ligne" /* LINE */, "line-color", linkColor);
+      this.map.setPaintProperty("ligne" /* LINE */, "line-opacity", linkOpacity);
+      this.map.setPaintProperty("ligne" /* LINE */, "line-width", linkWidth);
       if (station === undefined) {
-        if (map._debug) {
+        if (this._debug) {
           console.log("no stations with code " + phase.stationCode);
         }
         return Promise.resolve();
       }
       const event = src.features[0];
-      map._descPopups[1].setLngLat(station.geometry.coordinates).setText(popupString).addTo(map.map);
-      map._descPopups[1].getElement().style.color = "black";
-      map._descPopups[1].getElement().style.pointerEvents = "none !important";
-      map._descPopups[1].getElement().querySelectorAll("*").forEach((el2) => {
+      this._descPopups[1].setLngLat(station.geometry.coordinates).setText(popupString).addTo(this.map);
+      this._descPopups[1].getElement().style.color = "black";
+      this._descPopups[1].getElement().style.pointerEvents = "none !important";
+      this._descPopups[1].getElement().querySelectorAll("*").forEach((el2) => {
         el2.style.pointerEvents = "none";
       });
       const newData = {
@@ -34703,13 +34715,8 @@ class SismoMap {
           ]
         }
       };
-      map.map.getSource("ligne" /* LINE */)?.setData(newData);
-    }
-    if (this.map.loaded() || this._usable) {
-      display(this);
-    } else {
-      this.map.once("load", () => display(this));
-    }
+      this.map.getSource("ligne" /* LINE */)?.setData(newData);
+    });
   }
   displayRect({
     minlng,
@@ -34757,7 +34764,7 @@ class SismoMap {
       "place_village",
       "place_city_capital"
     ];
-    this.map.once("load", () => {
+    this.exec(() => {
       layersToChange.forEach((layer) => {
         this.map.setLayoutProperty(layer, "text-field", [
           "get",
@@ -34766,13 +34773,6 @@ class SismoMap {
       });
     });
   }
-  async getEventNumber() {
-    const source = this.map.getSource("events" /* EVENTS */);
-    if (source === undefined)
-      return Promise.reject(-1);
-    const sourceData = await source.getData();
-    return sourceData.features.length;
-  }
 }
 export {
   isEventGeoJSONProperties,

package/dist/sismomap.d.ts

@@ -18,6 +18,7 @@ export declare class SismoMap {
     _debug: boolean;
     _showDescription: boolean;
     _lang: string;
+    _legendClasses: string[] | undefined;
     constructor(name: string, map: maplibregl.Map, lang: string, legendClasses?: string[], bounds?: maplibregl.LngLatBoundsLike);
     /**
      * Clears all user-made layers
@@ -29,6 +30,11 @@ export declare class SismoMap {
     setDebug(mode: boolean): void;
     setZoomModeCenter(shouldCenterZoom: boolean): void;
     showZoom(enabled: boolean): void;
+    /**
+    * Whenever you need to write code that interacts with the map (like the layers or source), run the code inside map.exec
+    * It prevents the code from executing if the map isn't ready in any way and executes it as soon as it can.
+    */
+    exec(func: () => void): void;
     stopSpin(): void;
     startSpin(): void;
     setInteractive(interactive: boolean): void;
@@ -87,6 +93,7 @@ export declare class SismoMap {
     showContourLegend(type: ContourType | false): void;
     showIntensityLegend(enabled: boolean): void;
     private addContourLegend;
+    private addScale;
     private addMagLegend;
     private addIntensityLegend;
     /**
@@ -141,5 +148,4 @@ export declare class SismoMap {
     }): void;
     displayPolygon(coords: number[][]): void;
     changeLanguage(lang: string): void;
-    getEventNumber(): Promise<number>;
 }