namazu-ts 0.6.4 → 0.7.0

package/dist/browser/index.js

@@ -26603,7 +26603,7 @@ ${n2.shaderPreludeCode.vertexSource}`, define: n2.shaderDefine }, defaultProject
 });
 
 // src/index.ts
-var import_maplibre_gl2 = __toESM(require_maplibre_gl(), 1);
+var import_maplibre_gl3 = __toESM(require_maplibre_gl(), 1);
 
 // src/maputils.ts
 function EventToEventGeoJSON(e) {
@@ -26611,8 +26611,7 @@ function EventToEventGeoJSON(e) {
   const lng = e.preferredOrigin.longitude;
   const lat = e.preferredOrigin.latitude;
   let eWithMag = e;
-  eWithMag.mag = e.preferredMagnitude.magnitude;
-  eWithMag.type = e.eventType;
+  eWithMag.magnitude = e.preferredMagnitude.magnitude;
   let feature = {
     id: e.publicid,
     properties: eWithMag,
@@ -29534,7 +29533,7 @@ var ZoneNames = [
 ];
 var MagnitudesColors = [
   "step",
-  ["get", "mag"],
+  ["get", "magnitude"],
   "#fff900",
   2.5,
   "#ffce01",
@@ -29554,24 +29553,70 @@ var MagnitudesColors = [
   "#6f4e4e"
 ];
 var Intervals = new Map([
-  ["small", ["all", ["<", ["get", "mag"], 2.5]]],
-  ["3.0", ["all", [">=", ["get", "mag"], 2.5], ["<", ["get", "mag"], 3]]],
-  ["3.5", ["all", [">=", ["get", "mag"], 3], ["<", ["get", "mag"], 3.5]]],
-  ["4.0", ["all", [">=", ["get", "mag"], 3.5], ["<", ["get", "mag"], 4]]],
-  ["4.5", ["all", [">=", ["get", "mag"], 4], ["<", ["get", "mag"], 4.5]]],
-  ["5.0", ["all", [">=", ["get", "mag"], 4.5], ["<", ["get", "mag"], 5]]],
-  ["5.5", ["all", [">=", ["get", "mag"], 5], ["<", ["get", "mag"], 5.5]]],
-  ["6.0", ["all", [">=", ["get", "mag"], 5.5], ["<", ["get", "mag"], 6]]],
-  ["inf", ["all", [">=", ["get", "mag"], 6]]]
+  ["small", ["all", ["<", ["get", "magnitude"], 2.5]]],
+  [
+    "3.0",
+    [
+      "all",
+      [">=", ["get", "magnitude"], 2.5],
+      ["<", ["get", "magnitude"], 3]
+    ]
+  ],
+  [
+    "3.5",
+    [
+      "all",
+      [">=", ["get", "magnitude"], 3],
+      ["<", ["get", "magnitude"], 3.5]
+    ]
+  ],
+  [
+    "4.0",
+    [
+      "all",
+      [">=", ["get", "magnitude"], 3.5],
+      ["<", ["get", "magnitude"], 4]
+    ]
+  ],
+  [
+    "4.5",
+    [
+      "all",
+      [">=", ["get", "magnitude"], 4],
+      ["<", ["get", "magnitude"], 4.5]
+    ]
+  ],
+  [
+    "5.0",
+    [
+      "all",
+      [">=", ["get", "magnitude"], 4.5],
+      ["<", ["get", "magnitude"], 5]
+    ]
+  ],
+  [
+    "5.5",
+    [
+      "all",
+      [">=", ["get", "magnitude"], 5],
+      ["<", ["get", "magnitude"], 5.5]
+    ]
+  ],
+  [
+    "6.0",
+    [
+      "all",
+      [">=", ["get", "magnitude"], 5.5],
+      ["<", ["get", "magnitude"], 6]
+    ]
+  ],
+  ["inf", ["all", [">=", ["get", "magnitude"], 6]]]
 ]);
 
 // src/utils.ts
 function formatString(str) {
   return str.normalize("NFD").replace(/[\u0300-\u036f]/g, "").replace(/\s+/g, "-").toLowerCase().normalize("NFC");
 }
-function isEventGeoJSONProperties(obj) {
-  return !(obj.eventType !== undefined);
-}
 function isEventGeoJSON(obj) {
   return obj.features !== undefined;
 }
@@ -29601,6 +29646,14 @@ class Client {
   async fetchForm(id) {
     return this.apiCall(`/api/v1/surveys/forms/${id}`);
   }
+  async getEvents(args) {
+    let cArgs = this.cleanQuery(args);
+    if (cArgs.isErr()) {
+      return Promise.reject(cArgs.error);
+    }
+    let query = this.buildQuery("/api/v1/events", cArgs.value);
+    return this.apiCall(query);
+  }
   getQuestion(form, question_id) {
     return form.questions.find((question) => question.id == question_id);
   }
@@ -29771,8 +29824,8 @@ class Client {
   }
   cleanQuery(options) {
     let query = {};
-    if (options.eventid !== undefined) {
-      query.eventid = options.eventid;
+    if (options.event_publicid !== undefined) {
+      query.event_publicid = options.event_publicid;
       let values2 = ["xml", "text", "json"];
       if (options.format !== undefined) {
         if (values2.includes(options.format)) {
@@ -29783,40 +29836,40 @@ class Client {
       }
       return ok(query);
     }
-    if (options.starttime !== undefined) {
-      query.starttime = options.starttime;
+    if (options.start_time !== undefined) {
+      query.start_time = options.start_time;
     } else {
       let date = new Date;
       date.setDate(date.getDate() - 30);
-      query.starttime = date;
+      query.start_time = date;
     }
-    if (options.endtime !== undefined) {
-      query.endtime = options.endtime;
+    if (options.end_time !== undefined) {
+      query.end_time = options.end_time;
     }
-    if (options.minlatitude !== undefined) {
-      if (options.minlatitude <= 90 && options.minlatitude >= -90) {
-        query.minlatitude = options.minlatitude;
+    if (options.minimal_latitude !== undefined) {
+      if (options.minimal_latitude <= 90 && options.minimal_latitude >= -90) {
+        query.minimal_latitude = options.minimal_latitude;
       } else {
         return err(Error("Minimum latitude should be between -90 and 90"));
       }
     }
-    if (options.maxlatitude !== undefined) {
-      if (options.maxlatitude <= 90 && options.maxlatitude >= -90) {
-        query.maxlatitude = options.maxlatitude;
+    if (options.maximal_latitude !== undefined) {
+      if (options.maximal_latitude <= 90 && options.maximal_latitude >= -90) {
+        query.maximal_latitude = options.maximal_latitude;
       } else {
         return err(Error("Maximum latitude should be between -90 and 90"));
       }
     }
-    if (options.minlongitude !== undefined) {
-      if (options.minlongitude <= 180 && options.minlongitude >= -180) {
-        query.minlongitude = options.minlongitude;
+    if (options.minimal_longitude !== undefined) {
+      if (options.minimal_longitude <= 180 && options.minimal_longitude >= -180) {
+        query.minimal_longitude = options.minimal_longitude;
       } else {
         return err(Error("Minimum longitude should be between -180 and 180"));
       }
     }
-    if (options.maxlongitude !== undefined) {
-      if (options.maxlongitude <= 180 && options.maxlongitude >= -180) {
-        query.maxlongitude = options.maxlongitude;
+    if (options.maximal_longitude !== undefined) {
+      if (options.maximal_longitude <= 180 && options.maximal_longitude >= -180) {
+        query.maximal_longitude = options.maximal_longitude;
       } else {
         return err(Error("Maximum longitude should be between -180 and 180"));
       }
@@ -29835,33 +29888,33 @@ class Client {
         return err(Error("Longitude should be between -180 and 180"));
       }
     }
-    if (options.minradius !== undefined) {
-      if (options.minradius >= 0 && options.minradius <= 180) {
-        query.minradius = options.minradius;
+    if (options.minimal_radius !== undefined) {
+      if (options.minimal_radius >= 0 && options.minimal_radius <= 180) {
+        query.minimal_radius = options.minimal_radius;
       } else {
         return err(Error("Min radius should be between 0 and 180"));
       }
     }
-    if (options.maxradius !== undefined) {
-      if (options.maxradius >= 0 && options.maxradius <= 180) {
-        query.maxradius = options.maxradius;
+    if (options.maximal_radius !== undefined) {
+      if (options.maximal_radius >= 0 && options.maximal_radius <= 180) {
+        query.maximal_radius = options.maximal_radius;
       } else {
         return err(Error("Max radius should be between 0 and 180"));
       }
     }
     const keys = [
-      "mindepth",
-      "maxdepth",
-      "minmagnitude",
-      "maxmagnitude",
-      "magnitudetype",
-      "eventtype",
+      "minimal_depth",
+      "maximal_depth",
+      "minimal_magnitude",
+      "maximal_magnitude",
+      "magnitude_type",
+      "event_types",
       "includeallorigins",
       "includeallmagnitudes",
       "includearrivals",
       "catalog",
       "contributor",
-      "updatedafter"
+      "updated_after"
     ];
     keys.forEach((key) => {
       if (options[key] !== undefined) {
@@ -29883,9 +29936,9 @@ class Client {
       }
     }
     let values = ["time", "time-asc", "magnitude", "magnitude-asc"];
-    if (options.orderby !== undefined) {
-      if (values.includes(options.orderby)) {
-        query.orderby = options.orderby;
+    if (options.order_by !== undefined) {
+      if (values.includes(options.order_by)) {
+        query.order_by = options.order_by;
       } else {
         return err(Error("Orderby must be time, time-asc, magnitude or magnitude-asc"));
       }
@@ -29897,6 +29950,8 @@ class Client {
       } else {
         return err(Error("Format must be xml, text or json"));
       }
+    } else {
+      query.format = "json";
     }
     values = ["204", "404"];
     if (options.nodata !== undefined) {
@@ -29992,7 +30047,7 @@ var eventTypes = new Map([
   ["volcanic eruption", "éruption volcanique"]
 ]);
 // src/sismomap.ts
-var import_maplibre_gl = __toESM(require_maplibre_gl(), 1);
+var import_maplibre_gl2 = __toESM(require_maplibre_gl(), 1);
 
 // node_modules/@turf/meta/dist/esm/index.js
 function coordEach(geojson, callback, excludeWrapCoord) {
@@ -54995,11 +55050,9 @@ class SismoMap {
   name;
   map;
   descPopup;
-  _layers;
-  _sources;
   _mapscene;
   constructor(name, map, lang, bounds) {
-    let descPopup = new import_maplibre_gl.default.Popup({
+    let descPopup = new import_maplibre_gl2.default.Popup({
       closeButton: false,
       closeOnClick: false,
       maxWidth: "200px"
@@ -55014,6 +55067,51 @@ class SismoMap {
       if (typeof bounds != "undefined") {
         map.fitBounds(bounds);
       }
+      let emptySrc = {
+        type: "geojson",
+        data: {
+          type: "FeatureCollection",
+          features: []
+        }
+      };
+      map.addSource("src", emptySrc);
+      map.addSource("stat", structuredClone(emptySrc));
+      map.addLayer({
+        id: "event-layer",
+        source: "src",
+        type: "circle",
+        paint: {
+          "circle-radius": [
+            "*",
+            8,
+            ["ln", ["+", 1, ["get", "magnitude"]]]
+          ],
+          "circle-color": MagnitudesColors,
+          "circle-opacity": 0.8,
+          "circle-stroke-width": 1,
+          "circle-stroke-opacity": 0.9
+        }
+      });
+      const svgImage = new Image(20, 20);
+      const triangleSVG = `
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
+            <polygon points="12,2 22,22 2,22" fill="blue" />
+          </svg>`;
+      const encodedSVG = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(triangleSVG)}`;
+      svgImage.src = encodedSVG;
+      svgImage.onload = () => {
+        map.addImage("triangle", svgImage);
+      };
+      map.addLayer({
+        id: "station-layer",
+        source: "stat",
+        type: "symbol",
+        layout: {
+          "icon-image": "triangle",
+          "icon-allow-overlap": true,
+          "icon-size": 0.8
+        }
+      });
       let titles = ["event-layer", "station-layer"];
       titles.forEach((title) => {
         map.on("mouseenter", title, (e) => {
@@ -55021,8 +55119,6 @@ class SismoMap {
           map.getCanvas().style.cursor = "pointer";
           if (e.features == undefined)
             return;
-          if (!isEventGeoJSONProperties(e.features[0].properties))
-            return;
           let text = JSON.parse(e.features[0].properties.description);
           const feature = e.features[0];
           const [lng, lat] = feature.geometry.coordinates;
@@ -55037,23 +55133,25 @@ class SismoMap {
     this.name = name;
     this.map = map;
     this.descPopup = descPopup;
-    this._layers = [];
-    this._sources = [];
     this._mapscene = new O(this.map);
     this._mapscene.addLight(new AmbientLight(16777215, 0.8));
     this.changeLanguage(lang);
   }
   clear() {
-    this._layers.forEach((layer) => {
-      if (this.map.getLayer(layer)) {
-        this.map.removeLayer(layer);
-      }
-    });
-    this._sources.forEach((source) => {
-      if (this.map.getSource(source)) {
-        this.map.removeSource(source);
-      }
-    });
+    let src = this.map.getSource("src");
+    if (src != null) {
+      src.setData({
+        type: "FeatureCollection",
+        features: []
+      });
+    }
+    src = this.map.getSource("stat");
+    if (src != null) {
+      src.setData({
+        type: "FeatureCollection",
+        features: []
+      });
+    }
   }
   async displayStations(client, event, moveView = true, clear = true, stationOnly = false, model3D = true) {
     let eventGeo;
@@ -55111,27 +55209,7 @@ class SismoMap {
         this.centerView(stationsGeoJSON);
       }
     } else {
-      const svgImage = new Image(20, 20);
-      const triangleSVG = `
-          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-            <polygon points="12,2 22,22 2,22" fill="blue" />
-          </svg>`;
-      const encodedSVG = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(triangleSVG)}`;
-      svgImage.src = encodedSVG;
-      svgImage.onload = () => {
-        this.map.addImage("triangle", svgImage);
-      };
-      let layerSpec = {
-        id: "station-layer",
-        source: "stat",
-        type: "symbol",
-        layout: {
-          "icon-image": "triangle",
-          "icon-allow-overlap": true,
-          "icon-size": 0.8
-        }
-      };
-      if (this.displayGeoJSON(stationsGeoJSON, "stat", layerSpec, moveView, false).isErr())
+      if (this.displayGeoJSON(stationsGeoJSON, "stat", moveView, false).isErr())
         return Promise.reject();
     }
     return Promise.resolve();
@@ -55144,30 +55222,25 @@ class SismoMap {
       eventList = EventToEventGeoJSON(eventOrList);
     }
     eventList.features.forEach((_, i) => {
-      eventList.features[i].properties.type = eventList.features[i].properties.type || "event";
+      eventList.features[i].properties.eventType = eventList.features[i].properties.eventType || "event";
     });
-    let layerSpec = {
-      id: "event-layer",
-      source: "src",
-      type: "circle",
-      paint: {
-        "circle-radius": ["*", 8, ["ln", ["+", 1, ["get", "mag"]]]],
-        "circle-color": MagnitudesColors,
-        "circle-opacity": 0.8,
-        "circle-stroke-width": 1,
-        "circle-stroke-opacity": 0.9
-      }
-    };
-    this.displayGeoJSON(eventList, "src", layerSpec, moveView, clear);
+    this.displayGeoJSON(eventList, "src", moveView, clear);
   }
   updateSource(sourceName, newData) {
-    let source = this.map.getSource(sourceName);
-    let data = source?._data.geojson;
-    if (data === undefined)
-      return;
-    let geojson = data;
-    geojson.features = geojson.features.concat(newData.features);
-    source?.setData(geojson);
+    let sismap = this;
+    function upd() {
+      let source = sismap.map.getSource(sourceName);
+      if (source == undefined)
+        setTimeout(upd, 100);
+      source?.getData().then((data) => {
+        console.log("coucou");
+        let geojson = data;
+        geojson.features = geojson.features.concat(newData.features);
+        console.log(geojson);
+        source?.setData(geojson);
+      });
+    }
+    upd();
   }
   centerView(geojson) {
     if (geojson.features.length == 1) {
@@ -55183,33 +55256,24 @@ class SismoMap {
       this.map.fitBounds(bounds);
     }
   }
-  displayGeoJSON(geojson, sourceName, layerSpec, moveView, clear) {
-    if (geojson.features.length == 0)
-      return ok(null);
-    if (clear) {
-      this.clear();
-      this.map.addSource(sourceName, {
-        type: "geojson",
-        data: geojson
-      });
-      this.map.addLayer(layerSpec);
-    } else if (!clear && !this.map.getSource(sourceName)) {
-      this.map.addSource(sourceName, {
-        type: "geojson",
-        data: geojson
-      });
-      this.map.addLayer(layerSpec);
-    } else {
-      this.updateSource(sourceName, geojson);
-    }
-    if (moveView) {
-      this.centerView(geojson);
-    }
-    if (this._sources.includes(sourceName)) {
-      this._sources.push(sourceName);
+  displayGeoJSON(geojson, sourceName, moveView, clear) {
+    function display(map) {
+      console.log("displaying");
+      console.log(geojson);
+      if (geojson.features.length == 0)
+        return ok(null);
+      if (clear) {
+        map.clear();
+      }
+      map.updateSource(sourceName, geojson);
+      if (moveView) {
+        map.centerView(geojson);
+      }
     }
-    if (this._layers.includes(layerSpec.id)) {
-      this._layers.push(layerSpec.id);
+    if (this.map.loaded()) {
+      display(this);
+    } else {
+      this.map.once("load", () => display(this));
     }
     return ok(null);
   }
@@ -55262,7 +55326,7 @@ class SismoMap {
       for (let eventName of filterQuery.events) {
         if (!PossibleEvents.includes(eventName))
           return err(Error("Wrong Event type " + eventName));
-        let subfilter = ["==", eventName, ["get", "type"]];
+        let subfilter = ["==", eventName, ["get", "eventType"]];
         filter2[filter2.length - 1].push(subfilter);
       }
     }
@@ -55275,10 +55339,14 @@ class SismoMap {
         filter2[filter2.length - 1].push(Intervals.get(magnitude));
       }
     }
-    this.map.once("load", () => {
-      console.log(filter2);
+    if (this.map.loaded()) {
       this.map.setFilter("event-layer", filter2);
-    });
+    } else {
+      this.map.once("load", () => {
+        console.log(filter2);
+        this.map.setFilter("event-layer", filter2);
+      });
+    }
     return ok(null);
   }
   clearFilter() {
@@ -55343,7 +55411,7 @@ class SismoMap {
     return ok(data);
   }
 }
-var export_LngLatBounds = import_maplibre_gl2.LngLatBounds;
+var export_LngLatBounds = import_maplibre_gl3.LngLatBounds;
 
 export {
   eventTypes,

package/dist/client.d.ts

@@ -1,5 +1,5 @@
 import { AxiosRequestConfig } from 'axios';
-import { CleanedFDSNQueryOptions, EventPhases, FDSNQueryOptions, Zones } from './types';
+import { CleanedEventQueryOptions, EventPhases, EventQueryOptions, Zones } from './types';
 import { Result } from 'neverthrow';
 import { Form, Question, Survey, City, Testimony, QuestionChoice, Answer, EventGeoJSON, SisEvent as NamazuEvent, StationGeoJSON } from './types';
 export declare class Client {
@@ -9,6 +9,7 @@ export declare class Client {
     apiCall<Type>(apiRoute: AxiosRequestConfig): Promise<Type>;
     apiCall<Type>(apiRoute: string, method?: string): Promise<Type>;
     fetchForm(id: number): Promise<Form>;
+    getEvents(args: EventQueryOptions): Promise<EventGeoJSON>;
     getQuestion(form: Form, question_id: number): Question | undefined;
     getChoice(question: Question, choice_id: number): QuestionChoice | undefined;
     createIndividualTestimony(eventPublicID: string, email: string): Promise<Testimony>;
@@ -32,11 +33,11 @@ export declare class Client {
     getNextQuestion(form: Form, answers: Answer[], currentQuestion?: Question): Question | undefined;
     formatDateFR(dateString: Date): string;
     translateEventType(eventType: string): string;
-    buildQuery(url: string, options: CleanedFDSNQueryOptions): AxiosRequestConfig;
+    buildQuery(url: string, options: CleanedEventQueryOptions): AxiosRequestConfig;
     /**
      * <!> IF YOU WANT TO CAST AS NAMAZU TYPE LATER, SET format:'json'
      */
-    cleanQuery(options: FDSNQueryOptions): Result<CleanedFDSNQueryOptions, Error>;
+    cleanQuery(options: EventQueryOptions): Result<CleanedEventQueryOptions, Error>;
     getZones(): Promise<Zones>;
     getZoneNameByEvent(event: EventGeoJSON): Promise<string>;
     getStationsByZoneName(zoneName: string): Promise<StationGeoJSON>;