@geops/rvf-mobility-web-component 0.1.66 → 0.1.68

package/package.json

@@ -2,7 +2,7 @@
   "name": "@geops/rvf-mobility-web-component",
   "license": "UNLICENSED",
   "description": "Web components for rvf in the domains of mobility and logistics.",
-  "version": "0.1.66",
+  "version": "0.1.68",
   "homepage": "https://rvf-mobility-web-component-geops.vercel.app/",
   "type": "module",
   "main": "index.js",

package/src/MapsetLayer/MapsetLayer.tsx

@@ -18,7 +18,9 @@ function MapsetLayer(props?: Partial<MapsetLayerOptions>) {
     map,
     mapsetbbox,
     mapsetplanid,
+    mapsettags,
     mapsettenants,
+    mapsettimestamp,
     mapseturl,
     setMapsetLayer,
   } = useMapContext();
@@ -27,34 +29,53 @@ function MapsetLayer(props?: Partial<MapsetLayerOptions>) {
     if (!baseLayer || !map) {
       return null;
     }
+
+    let bbox = undefined;
+    if (mapsetbbox) {
+      bbox = mapsetbbox?.split(",").map((coord) => {
+        return Number(coord.trim());
+      });
+      if (
+        bbox.length === 4 &&
+        !bbox.some((coord) => {
+          return Number.isNaN(coord);
+        })
+      ) {
+        bbox = transformExtent(bbox, "EPSG:3857", "EPSG:4326");
+      }
+    } else {
+      bbox = transformExtent(
+        map.getView()?.calculateExtent(map.getSize()),
+        "EPSG:3857",
+        "EPSG:4326",
+      );
+    }
     return new MtbMapsetLayer({
       apiKey: apikey,
-      bbox:
-        mapsetbbox?.split(",").map((coord) => {
-          return Number(coord.trim());
-        }) ||
-        transformExtent(
-          map.getView()?.calculateExtent(map.getSize()),
-          "EPSG:3857",
-          "EPSG:4326",
-        ),
+      bbox,
       mapseturl: mapseturl || undefined,
       name: LAYER_NAME_MAPSET,
       planId: mapsetplanid ?? undefined,
+      tags: mapsettags?.split(",").map((t) => {
+        return t.trim();
+      }),
       tenants: mapsettenants?.split(",").map((t) => {
         return t.trim();
       }),
+      timestamp: mapsettimestamp || new Date().toISOString(), // Load only standard plan
       zoom: map.getView().getZoom(),
       ...(props || {}),
     });
   }, [
-    apikey,
     baseLayer,
     map,
     mapsetbbox,
-    mapsettenants,
-    mapsetplanid,
+    apikey,
     mapseturl,
+    mapsetplanid,
+    mapsettags,
+    mapsettenants,
+    mapsettimestamp,
     props,
   ]);
 

package/src/MobilityMap/MobilityMapAttributes.ts

@@ -42,7 +42,9 @@ export type MobilityMapAttributeName =
   | "mapset"
   | "mapsetbbox"
   | "mapsetplanid"
+  | "mapsettags"
   | "mapsettenants"
+  | "mapsettimestamp"
   | "mapseturl"
   | "mapsurl"
   | "maxextent"
@@ -181,7 +183,7 @@ where:
   },
   mapset: {
     defaultValue: "false",
-    description: `Add the mapset layer to the map. This layer will display mapset plans on the map.`,
+    description: `Add the mapset layer to the map. This layer will display mapset plans on the map. By default, it will load only the standard plans valid at the current time.`,
     public: true,
     type: "boolean",
   },
@@ -192,12 +194,21 @@ where:
     public: false,
   },
   mapsetplanid: {
-    description: "The id of the mapset plan to display.",
+    description:
+      "The id of the mapset plan to display. Mostly for debugging purposes.",
     public: false,
   },
+  mapsettags: {
+    description: `The ${geopsMapsetApiLink} tags to get the plans from.`,
+    public: true,
+  },
   mapsettenants: {
     defaultValue: "rvf",
-    description: `The ${geopsMapsetApiLink} tenant to get the mapset from.`,
+    description: `The ${geopsMapsetApiLink} tenant to get the plans from.`,
+    public: false,
+  },
+  mapsettimestamp: {
+    description: `The ${geopsMapsetApiLink} timestamp used to load valid standard plan. If not defined it will use the current time.`,
     public: false,
   },
   mapseturl: {

package/src/RvfCopyright/RvfCopyright.tsx

@@ -18,7 +18,11 @@ const format = (copyrights) => {
     }
   });
 
-  return newCopyrights.join(" | ");
+  return newCopyrights
+    .sort((a, b) => {
+      return a < b ? -1 : 1;
+    })
+    .join("&nbsp;|&nbsp;");
 };
 
 const options = {