@opengeoweb/cap 11.1.0 → 12.1.0

package/index.esm.js

@@ -5,13 +5,14 @@ import { Box as Box$1 } from '@mui/system';
 import { dateUtils, AlertBanner } from '@opengeoweb/shared';
 import { useSelector, useDispatch } from 'react-redux';
 import { createEntityAdapter, createSlice, createSelector, combineReducers, configureStore } from '@reduxjs/toolkit';
-import React from 'react';
+import React, { useMemo } from 'react';
 import i18n from 'i18next';
 import { useTranslation } from 'react-i18next';
 import { ConfigurableMapConnect } from '@opengeoweb/core';
 import '@opengeoweb/timeslider';
-import { MapViewLayer, MapWarningProperties } from '@opengeoweb/webmap-react';
-import { mapListener, serviceListener, layersListener, syncGroupsListener, genericListener, mapReducer, serviceReducer, layerReducer, syncGroupsReducer, mapSelectors } from '@opengeoweb/store';
+import { isOpenLayersEnabled, OpenLayersFeatureLayer, genericOpenLayersFeatureStyle, MapViewLayer, MapWarningProperties } from '@opengeoweb/webmap-react';
+import { GeoJSON } from 'ol/format';
+import { mapListener, serviceListener, layersListener, syncGroupsListener, genericListener, openlayersListener, mapReducer, serviceReducer, layerReducer, syncGroupsReducer, mapSelectors } from '@opengeoweb/store';
 import { webmapUtils } from '@opengeoweb/webmap';
 
 var en = {
@@ -1044,7 +1045,7 @@ var capReducersMap = {
   syncGroups: syncGroupsReducer,
   cap: capReducer
 };
-var capMiddlewares = [mapListener.middleware, serviceListener.middleware, layersListener.middleware, syncGroupsListener.middleware, genericListener.middleware];
+var capMiddlewares = [mapListener.middleware, serviceListener.middleware, layersListener.middleware, syncGroupsListener.middleware, genericListener.middleware, openlayersListener.middleware];
 var capRootReducer = combineReducers(capReducersMap);
 var createMockStore = function createMockStore(mockState) {
   return configureStore({
@@ -1052,7 +1053,8 @@ var createMockStore = function createMockStore(mockState) {
     preloadedState: mockState,
     middleware: function middleware(getDefaultMiddleware) {
       return getDefaultMiddleware().concat(capMiddlewares);
-    }
+    },
+    devTools: true
   });
 };
 
@@ -1188,7 +1190,8 @@ var MapViewCapConnect = function MapViewCapConnect(_ref) {
     bbox = _ref.bbox,
     srs = _ref.srs,
     capWarningPresets = _ref.capWarningPresets,
-    layers = _ref.layers;
+    layers = _ref.layers,
+    children = _ref.children;
   var _useApiContext = useApiContext(),
     api = _useApiContext.api;
   var dispatch = useDispatch();
@@ -1441,24 +1444,47 @@ var MapViewCapConnect = function MapViewCapConnect(_ref) {
     setSelectedFeatureEvent(featureResults);
     setFeaturesByAlert(nextState);
   };
+  var clickOnFeature = useMemo(function () {
+    return {
+      onClick: function onClick(f) {
+        var featureResults = f.length === 0 ? undefined : {
+          feature: new GeoJSON().writeFeatureObject(f[0]),
+          coordinateIndexInFeature: null,
+          featureIndex: null,
+          screenCoords: null,
+          mouseX: null,
+          mouseY: null,
+          isInEditMode: null
+        };
+        setSelectedFeatureEvent(featureResults);
+        setFeaturesByAlert(function (previous) {
+          return highlightGeoJson(previous, featureResults);
+        });
+      }
+    };
+  }, []);
   var selectedTime = useSelector(function (store) {
     return mapSelectors.getSelectedTime(store, mapIdRef.current);
   });
-  var alertIdsInEffect = useSelector(function (store) {
+  var alertsInEffect = useSelector(function (store) {
     return getAlertsInEffect(store, dateUtils.fromUnix(selectedTime).toISOString());
-  }).map(function (_ref13) {
-    var identifier = _ref13.identifier;
-    return identifier;
-  });
-  var featuresInEffect = Object.keys(featuresByAlert).filter(function (id) {
-    return alertIdsInEffect.includes(id);
-  }).flatMap(function (id) {
-    return featuresByAlert[id];
   });
-  var geoJsonObject = {
-    type: 'FeatureCollection',
-    features: featuresInEffect
-  };
+  var geoJsonObject = useMemo(function () {
+    var alertIdsInEffect = alertsInEffect.map(function (_ref13) {
+      var identifier = _ref13.identifier;
+      return identifier;
+    });
+    var featuresInEffect = Object.keys(featuresByAlert).filter(function (id) {
+      return alertIdsInEffect.includes(id);
+    }).flatMap(function (id) {
+      return featuresByAlert[id];
+    });
+    return {
+      type: 'FeatureCollection',
+      features: featuresInEffect
+    };
+  }, [featuresByAlert, alertsInEffect]);
+  var useOl = isOpenLayersEnabled();
   return jsx("div", {
     "data-testid": "mapViewCap",
     style: {
@@ -1471,9 +1497,15 @@ var MapViewCapConnect = function MapViewCapConnect(_ref) {
       title: title,
       layers: layers || [],
       "data-testid": "capWarningMap",
-      bbox: bbox,
+      initialBbox: bbox,
       srs: srs,
-      children: [jsx(MapViewLayer, {
+      children: [useOl ? jsx(OpenLayersFeatureLayer, {
+        featureCollection: geoJsonObject,
+        style: genericOpenLayersFeatureStyle,
+        clickOnFeature: clickOnFeature,
+        zIndex: 1000,
+        testId: "MapViewCap-features"
+      }) : jsx(MapViewLayer, {
         id: layerIdRef.current,
         geojson: geoJsonObject,
         onClickFeature: highLightGeoJsonOnClick,
@@ -1483,7 +1515,7 @@ var MapViewCapConnect = function MapViewCapConnect(_ref) {
         selectedFeatureProperties: selectedFeatureEvent.feature.properties.details,
         languageIndex: findEventIndexInLanguage(i18n.language, selectedFeatureEvent.feature.properties.details.languages, capWarningPresets, selectedFeatureEvent.feature.properties.details.feedAddress),
         parentSize: parentSize
-      })]
+      }), children]
     })
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/cap",
-  "version": "11.1.0",
+  "version": "12.1.0",
   "description": "GeoWeb Common Alerting Protocol (CAP) library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,22 +8,23 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "*",
-    "@opengeoweb/core": "*",
+    "@opengeoweb/api": "12.1.0",
+    "@opengeoweb/core": "12.1.0",
     "frappe-gantt": "^0.6.1",
-    "@opengeoweb/shared": "*",
-    "@opengeoweb/store": "*",
+    "@opengeoweb/shared": "12.1.0",
+    "@opengeoweb/store": "12.1.0",
     "react-redux": "^8.1.3",
-    "@opengeoweb/webmap": "*",
-    "@opengeoweb/webmap-react": "*",
+    "@opengeoweb/webmap": "12.1.0",
+    "@opengeoweb/webmap-react": "12.1.0",
     "@mui/system": "^6.1.1",
     "react-i18next": "^15.1.1",
     "@reduxjs/toolkit": "^1.9.7",
-    "@opengeoweb/theme": "*",
+    "@opengeoweb/theme": "12.1.0",
     "i18next": "^23.11.5",
     "axios": "^1.7.7",
-    "@opengeoweb/timeslider": "*",
-    "@mui/material": "^6.1.1"
+    "@opengeoweb/timeslider": "12.1.0",
+    "@mui/material": "^6.1.1",
+    "ol": "^10.4.0"
   },
   "peerDependencies": {
     "react": "18",

package/src/lib/components/MapViewCap/MapViewCapConnect.d.ts

@@ -13,5 +13,6 @@ export interface MapViewCapConnectProps {
     srs?: string;
     capWarningPresets?: CapPresets;
     layers?: InitialMapProps['mapPreset']['layers'];
+    children?: React.ReactNode;
 }
 export declare const MapViewCapConnect: React.FC<MapViewCapConnectProps>;