@geops/rvf-mobility-web-component 0.1.43 → 0.1.45

package/src/RvfTopics/RvfTopics.tsx

@@ -1,6 +1,7 @@
 import { getUid } from "ol";
 import { Group } from "ol/layer";
 import BaseLayer from "ol/layer/Base";
+import { unByKey } from "ol/Observable";
 import { JSX, PreactDOMAttributes } from "preact";
 import { memo, useEffect, useMemo, useState } from "preact/compat";
 
@@ -60,14 +61,37 @@ function RvfTopics(props: RvfTopicsProps) {
 
   // Force update of config when a layers`s visibility changes progammatically
   useEffect(() => {
+    const keys = [];
     const layers = getLayersAsFlatArray(map.getLayers().getArray());
     layers.forEach((layer) => {
-      layer.on("change:visible", () => {
+      const key = layer.on("change:visible", () => {
         setRevision((prev) => {
           return prev + 1;
         });
       });
+      keys.push(key);
     });
+    keys.push(
+      map.on("change:layergroup", () => {
+        setRevision((prev) => {
+          return prev + 1;
+        });
+      }),
+      map.getLayers().on("add", () => {
+        setRevision((prev) => {
+          return prev + 1;
+        });
+      }),
+      map.getLayers().on("remove", () => {
+        setRevision((prev) => {
+          return prev + 1;
+        });
+      }),
+    );
+    return () => {
+      // Clean up all listeners
+      unByKey(keys);
+    };
   }, [map]);
 
   return <RvfLayerTree layers={layers} {...props} />;

package/src/utils/constants.ts

@@ -32,6 +32,7 @@ export const RVF_LAYERS_TITLES = {
   fahrrad: "Fahrrad",
   haltestellen: "Haltestellen",
   liniennetz: "Liniennetz",
+  meldungen: "Meldungen",
   mitfahrpunkte: "Mitfahrpunkte",
   pois: "POIs",
   sharedMobility: "Shared Mobility",
@@ -60,6 +61,8 @@ export const RVF_LAYERS_NAMES = {
 export const WFS_CARGO_BIKE_TYPE = "sharing_stations_cargo_bicycle";
 export const WFS_CAR_TYPE = "sharing_stations_car";
 export const WFS_BIKE_TYPE = "sharing_stations_bicycle";
+export const WFS_STATIONS_TYPE = "sharing_stations";
+
 export const WFS_FREE_FLOAT_TYPE = "sharing_vehicles";
 
 export const SOURCE_STATIONS_BIKE = WFS_BIKE_TYPE;
@@ -85,10 +88,10 @@ export const API_REQUEST_FEATURE_TYPE = {
     scooter: "sharing_vehicles",
   },
   stations: {
-    bike: "sharing_stations_bicycle",
-    car: "sharing_stations_car",
-    cargoBike: "sharing_stations_cargo_bicycle",
-    scooter: "sharing_stations_scooters_standing",
+    bike: "sharing_stations",
+    car: "sharing_stations",
+    cargoBike: "sharing_stations",
+    scooter: "sharing_stations",
   },
 };
 

package/src/utils/hooks/useMapContext.tsx

@@ -5,6 +5,7 @@ import {
   RealtimeLayer,
 } from "mobility-toolbox-js/ol";
 import {
+  MocoNotification,
   RealtimeStation,
   RealtimeStationId,
   RealtimeStopSequence,
@@ -23,11 +24,13 @@ export type MapContextType = {
   isTracking: boolean;
   layers: string;
   map: Map;
+  previewNotification?: MocoNotification;
   realtimeLayer: RealtimeLayer;
   setBaseLayer: (baseLayer: MaplibreLayer) => void;
   setIsFollowing: (isFollowing: boolean) => void;
   setIsTracking: (isTracking: boolean) => void;
   setMap: (map?: Map) => void;
+  setPreviewNotification: (previewNotification?: MocoNotification) => void;
   setRealtimeLayer: (realtimeLayer?: RealtimeLayer) => void;
   setStation: (station?: RealtimeStation) => void;
   setStationId: (stationId?: RealtimeStationId) => void;
@@ -47,11 +50,13 @@ export const MapContext = createContext<MapContextType>({
   isTracking: false,
   layers: null,
   map: null,
+  previewNotification: null,
   realtimeLayer: null,
   setBaseLayer: (baseLayer?: MaplibreLayer) => {},
   setIsFollowing: (isFollowing: boolean) => {},
   setIsTracking: (isTracking: boolean) => {},
   setMap: (map?: Map) => {},
+  setPreviewNotification: (previewNotification?: MocoNotification) => {},
   setRealtimeLayer: (realtimeLayer?: RealtimeLayer) => {},
   setStation: (station?: RealtimeStation) => {},
   setStationId: (stationId?: RealtimeStationId) => {},

package/src/utils/sharingWFSUtils.ts

@@ -17,6 +17,12 @@ export type SharingStationWFS = {
   feed_id: string;
   last_reported: string;
   name: string;
+  num_bicycles_available: null | number;
+  num_cargo_bicycles_available: null | number;
+  num_cars_available: null | number;
+  num_mopeds_available: null | number;
+  num_scooters_standing_available: null | number;
+  // Backward compatibility with style
   num_vehicles_available: number;
   rental_uris_android: string;
   rental_uris_ios: string;