@opengeoweb/core 9.26.0 → 9.27.1

package/README.md

@@ -9,7 +9,7 @@ This library was generated with [Nx](https://nx.dev).
 ## Installation
 
 ```
-npm install @opengeoweb/core @opengeoweb/store @opengeoweb/timeslider @redux-eggs/redux-toolkit @redux-eggs/saga-extension
+npm install @opengeoweb/core @opengeoweb/store @opengeoweb/timeslider @redux-eggs/redux-toolkit
 ```
 
 ## Use
@@ -27,11 +27,8 @@ import {
 import { mapActions } from '@opengeoweb/store';
 import { TimeSliderConnect } from '@opengeoweb/timeslider';
 import { createStore } from '@redux-eggs/redux-toolkit';
-import { getSagaExtension } from '@redux-eggs/saga-extension';
 
-const store = createStore({
-  extensions: [getSagaExtension()],
-});
+const store = createStore({});
 
 const ConnectedMapWithTimeSlider = ({ mapId }) => {
   const dispatch = useDispatch();

package/index.esm.js

@@ -6,12 +6,12 @@ import { SHARED_NAMESPACE, sharedTranslations, CustomIconButton, TooltipSelect,
 import { CollapseSmall, CollapseMedium, CollapseLarge, CollapseWindow, ExpandWindow, LayersAdd, CloudLoading, Copy, None, FastForward, AutoUpdateActive, Both, Visibility, VisibilityOff, Delete, DragHandle as DragHandle$1, Cached, Add, MapAdd, WorldMapProjection, Layers, ExitDomain, Info, Search, Exclamation, MyLocation, Close, ThemeWrapper, lightTheme } from '@opengeoweb/theme';
 import i18n from 'i18next';
 import { useTranslation, initReactI18next, I18nextProvider } from 'react-i18next';
-import { TIMESLIDER_NAMESPACE, timesliderTranslations, defaultTimeSpan, TIME_SLIDER_LEGEND_HEIGHT, SpeedButton, TimeStepButton, AnimationLengthButton, AnimationLength, TimeSpanButton, marks as marks$1, secondsPerPxFromCanvasWidth, getNewCenterOfFixedPointZoom, OptionsMenuButton, PlayButton, defaultTimeStep, BackwardForwardStepButton, AutoUpdateButton, NowButton, handleSetNowEvent, TimeSliderButtons, TimeSliderCurrentTimeBox, TimeSliderLegend, TimeSlider, onsetNewDateDebounced, getFilteredTime, ControlButtons, OptionsMenu, TimeSliderClock } from '@opengeoweb/timeslider';
-import { WEBMAP_REACT_NAMESPACE, webmapReactTranslations, LayerInfoButton, LayerInfoDialog, MapControlButton, MapDimensionSelect, dimensionConfig, DimensionSelectDialog, DimensionSelectButton, ZoomControls, MapView, MapViewLayer, LegendDialog, LegendButton, registerDrawFunction, emptyGeoJSON, MapControls, publicLayers } from '@opengeoweb/webmap-react';
+import { TIMESLIDER_NAMESPACE, timesliderTranslations, defaultTimeSpan, TIME_SLIDER_LEGEND_HEIGHT, SpeedButton, TimeStepButton, AnimationLengthButton, AnimationLength, TimeSpanButton, secondsPerPxFromCanvasWidth, getNewCenterOfFixedPointZoom, OptionsMenuButton, PlayButton, defaultTimeStep, BackwardForwardStepButton, AutoUpdateButton, NowButton, handleSetNowEvent, TimeSliderButtons, TimeSliderCurrentTimeBox, TimeSliderLegend, TimeSlider, onsetNewDateDebounced, getFilteredTime, ControlButtons, OptionsMenu, TimeSliderClock } from '@opengeoweb/timeslider';
+import { WEBMAP_REACT_NAMESPACE, webmapReactTranslations, WEBMAP_NAMESPACE, webmapTranslations, LayerInfoButton, LayerInfoDialog, MapControlButton, MapDimensionSelect, dimensionConfig, DimensionSelectDialog, DimensionSelectButton, ZoomControls, MapView, MapViewLayer, LegendDialog, LegendButton, registerDrawFunction, emptyGeoJSON, MapControls, publicLayers } from '@opengeoweb/webmap-react';
 import { useDispatch, useSelector, connect, useStore, Provider } from 'react-redux';
 import { ReactSortable } from 'react-sortablejs';
 import Sortable from 'sortablejs';
-import { layerTypes, layerUtils, layerActions, layerSelectors, serviceSelectors, serviceActions, mapSelectors, mapActions, mapEnums, uiSelectors, uiTypes, useSetupDialog, filterLayers, getUserAddedServices, uiActions, genericActions, drawtoolSelectors, syncConstants, loadingIndicatorActions, IS_LEGEND_OPEN_BY_DEFAULT, defaultLayers, mapStoreActions, getSingularDrawtoolDrawLayerId, syncGroupsSelectors, syncGroupsSelector, coreModuleConfig, routerUtils, routerModuleConfig } from '@opengeoweb/store';
+import { layerTypes, layerUtils, mapSelectors, layerActions, layerSelectors, serviceSelectors, serviceActions, mapActions, mapEnums, uiSelectors, uiTypes, useSetupDialog, filterLayers, getUserAddedServices, uiActions, genericActions, drawtoolSelectors, syncConstants, loadingIndicatorActions, IS_LEGEND_OPEN_BY_DEFAULT, defaultLayers, mapStoreActions, getSingularDrawtoolDrawLayerId, syncGroupsSelectors, syncGroupsSelector, coreModuleConfig, routerUtils, routerModuleConfig } from '@opengeoweb/store';
 import { webmapUtils, getCapabilities, WMGetServiceFromStore, LayerType, handleDateUtilsISOString, wmServiceListener, EVENT_GETCAPABILITIES_START, EVENT_GETCAPABILITIES_READY, getWMSGetFeatureInfoRequestURL, WMLayer } from '@opengeoweb/webmap';
 import { Box as Box$1, styled as styled$1 } from '@mui/system';
 import _, { isEqual, range } from 'lodash';
@@ -1964,24 +1964,28 @@ const initCoreReactI18n = () => {
       en: {
         [CORE_NAMESPACE]: coreTranslations.en,
         [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.en,
+        [WEBMAP_NAMESPACE]: webmapTranslations.en,
         [SHARED_NAMESPACE]: sharedTranslations.en,
         [TIMESLIDER_NAMESPACE]: timesliderTranslations.en
       },
       fi: {
         [CORE_NAMESPACE]: coreTranslations.fi,
         [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.fi,
+        [WEBMAP_NAMESPACE]: webmapTranslations.fi,
         [SHARED_NAMESPACE]: sharedTranslations.fi,
         [TIMESLIDER_NAMESPACE]: timesliderTranslations.fi
       },
       no: {
         [CORE_NAMESPACE]: coreTranslations.no,
         [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.no,
+        [WEBMAP_NAMESPACE]: webmapTranslations.no,
         [SHARED_NAMESPACE]: sharedTranslations.no,
         [TIMESLIDER_NAMESPACE]: timesliderTranslations.no
       },
       nl: {
         [CORE_NAMESPACE]: coreTranslations.nl,
         [WEBMAP_REACT_NAMESPACE]: webmapReactTranslations.nl,
+        [WEBMAP_NAMESPACE]: webmapTranslations.nl,
         [SHARED_NAMESPACE]: sharedTranslations.nl,
         [TIMESLIDER_NAMESPACE]: timesliderTranslations.nl
       }
@@ -4269,14 +4273,16 @@ const DeleteLayerConnect = ({
   icon: _icon = jsx(Delete, {})
 }) => {
   const dispatch = useDispatch();
+  const layerIndex = useSelector(store => mapSelectors.getLayerIndexByLayerId(store, mapId, layerId));
   const layerDelete = React.useCallback(({
     mapId,
     layerId
   }) => dispatch(layerActions.layerDelete({
     mapId,
     layerId,
+    layerIndex,
     origin: layerTypes.LayerActionOrigin.layerManager
-  })), [dispatch]);
+  })), [dispatch, layerIndex]);
   const isLayerEnabled = useSelector(store => layerSelectors.getLayerEnabled(store, layerId));
   return jsx(CustomIconButton, Object.assign({
     tooltipTitle: _tooltipTitle,
@@ -8855,7 +8861,7 @@ const TimeStepButtonConnect = ({
     onChangeTimeStep: onSetTimeStep,
     disabled: isAnimating,
     onToggleTimestepAuto: onToggleTimestepAuto,
-    isTimestepAuto: Boolean(isTimestepAuto) && Boolean(timeStepFromLayer),
+    isTimestepAuto: isTimestepAuto && Boolean(timeStepFromLayer),
     timeStepFromLayer: timeStepFromLayer
   });
 };
@@ -8918,9 +8924,11 @@ const TimeSpanButtonConnect = ({
       origin: mapEnums.MapActionOrigin.map
     }));
   }, [dispatch, isTimeSpanAuto, mapId]);
-  const onChangeTimeSliderSpan = newSliderValue => {
-    const newValue = newSliderValue ? Math.round(newSliderValue) : 0;
-    const spanInSeconds = marks$1.find(el => el.value === newValue).value;
+  const onChangeTimeSliderSpan = valueInMinutes => {
+    if (isTimeSpanAuto) {
+      onToggleTimeSpanAuto();
+    }
+    const spanInSeconds = valueInMinutes * 60;
     const timeSliderWidth = mapSelectors.getMapTimeSliderWidth(store.getState(), mapId);
     const selectedTime = mapSelectors.getSelectedTime(store.getState(), mapId);
     const secondsPerPx = mapSelectors.getMapTimeSliderSecondsPerPx(store.getState(), mapId);
@@ -8942,12 +8950,6 @@ const TimeSpanButtonConnect = ({
       }));
     }
   };
-  const onMenuItemClick = markValue => {
-    if (isTimeSpanAuto) {
-      onToggleTimeSpanAuto();
-    }
-    onChangeTimeSliderSpan(markValue);
-  };
   const onToggleTimeSpan = () => {
     if (isTimeSpanAuto) {
       return;
@@ -8955,11 +8957,10 @@ const TimeSpanButtonConnect = ({
     onToggleTimeSpanAuto();
   };
   return jsx(TimeSpanButton, {
-    timeSliderSpan: timeSliderSpan,
+    timeSliderSpan: timeSliderSpan / 60,
     disabled: isAnimating,
     onChangeSliderValue: onChangeTimeSliderSpan,
     onToggleTimeSpan: onToggleTimeSpan,
-    onMenuItemClick: onMenuItemClick,
     isTimeSpanAuto: Boolean(isTimeSpanAuto) && Boolean(timeStepFromLayer),
     layerHasTimeStep: Boolean(timeStepFromLayer)
   });
@@ -9602,9 +9603,10 @@ const ConfigurableMapConnect = _a => {
       shouldDisplayDrawControls = false,
       displaySearchButtonInMap = false,
       mapControls,
-      children
+      children,
+      shouldDisablePrefetching
     } = _a,
-    props = __rest(_a, ["id", "dockedLayerManagerSize", "title", "layers", "dimensions", "shouldAutoUpdate", "shouldAnimate", "shouldAutoFetch", "bbox", "srs", "shouldShowZoomControls", "displayMapPin", "showTimeSlider", "disableTimeSlider", "displayTimeInMap", "displayLayerManagerAndLegendButtonInMap", "displayDimensionSelectButtonInMap", "multiLegend", "shouldShowLayerManager", "shouldShowDockedLayerManager", "showClock", "displayGetFeatureInfoButtonInMap", "shouldDisplayDrawControls", "displaySearchButtonInMap", "mapControls", "children"]);
+    props = __rest(_a, ["id", "dockedLayerManagerSize", "title", "layers", "dimensions", "shouldAutoUpdate", "shouldAnimate", "shouldAutoFetch", "bbox", "srs", "shouldShowZoomControls", "displayMapPin", "showTimeSlider", "disableTimeSlider", "displayTimeInMap", "displayLayerManagerAndLegendButtonInMap", "displayDimensionSelectButtonInMap", "multiLegend", "shouldShowLayerManager", "shouldShowDockedLayerManager", "showClock", "displayGetFeatureInfoButtonInMap", "shouldDisplayDrawControls", "displaySearchButtonInMap", "mapControls", "children", "shouldDisablePrefetching"]);
   const dispatch = useDispatch();
   const mapId = React__default.useRef(id || webmapUtils.generateMapId()).current;
   React__default.useEffect(() => {
@@ -9719,7 +9721,8 @@ const ConfigurableMapConnect = _a => {
         displayTimeInMap: displayTimeInMap,
         showScaleBar: false,
         shouldAutoFetch: shouldAutoFetch,
-        mapId: mapId
+        mapId: mapId,
+        shouldDisablePrefetching: shouldDisablePrefetching
       }, {
         children: children
       })), multiLegend && jsx(LegendConnect, {
@@ -9739,7 +9742,7 @@ const ConfigurableMapConnect = _a => {
         isDocked: true
       })]
     }));
-  }, [children, disableTimeSlider, displayDimensionSelectButtonInMap, displayGetFeatureInfoButtonInMap, displayLayerManagerAndLegendButtonInMap, displaySearchButtonInMap, displayTimeInMap, id, mapControls, mapControlsPositionTop, mapId, multiLegend, showClock, shouldAutoFetch, title]);
+  }, [children, disableTimeSlider, displayDimensionSelectButtonInMap, displayGetFeatureInfoButtonInMap, displayLayerManagerAndLegendButtonInMap, displaySearchButtonInMap, displayTimeInMap, id, mapControls, mapControlsPositionTop, mapId, multiLegend, showClock, shouldAutoFetch, title, shouldDisablePrefetching]);
 };
 
 var uncurryThis$1 = functionUncurryThis;
@@ -10024,7 +10027,8 @@ const MultiMapViewConnect = ({
           showTimeSlider: false,
           disableTimeSlider: true,
           showClock: false,
-          multiLegend: _multiLegend
+          multiLegend: _multiLegend,
+          shouldDisablePrefetching: map.componentType === 'MultiMap'
         })
       }), mapId);
     })]
@@ -10077,6 +10081,7 @@ const makeMapPreset = (timeIncrement, uniqueId, referenceTime, layers, syncGroup
       top: 7540256.313079321
     },
     srs: PROJECTION.EPSG_3857.value,
+    componentType: 'MultiMap',
     layers: layers.map((layer, index) => Object.assign(Object.assign({}, layer), {
       id: `${uniqueId}-${index}`,
       dimensions: [{
@@ -10168,6 +10173,7 @@ const HarmonieTempAndPrecipPreset = ({
         top: 7438773.776232235
       },
       srs: PROJECTION.EPSG_3857.value,
+      componentType: 'MultiMap',
       layers: [Object.assign(Object.assign({}, layer), {
         id: uniqueId,
         dimensions: [{
@@ -10256,7 +10262,8 @@ const componentsLookUp = ({
               autoUpdateLayerId,
               autoTimeStepLayerId,
               bbox: (_b = (_a = mapPreset[0]) === null || _a === void 0 ? void 0 : _a.proj) === null || _b === void 0 ? void 0 : _b.bbox,
-              srs: (_d = (_c = mapPreset[0]) === null || _c === void 0 ? void 0 : _c.proj) === null || _d === void 0 ? void 0 : _d.srs
+              srs: (_d = (_c = mapPreset[0]) === null || _c === void 0 ? void 0 : _c.proj) === null || _d === void 0 ? void 0 : _d.srs,
+              componentType: 'MultiMap'
             };
           }),
           "data-testid": "coreMultiMapViewConnect"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "9.26.0",
+  "version": "9.27.1",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -32,7 +32,9 @@
     "@sentry/react": "^7.109.0"
   },
   "peerDependencies": {
-    "react": "18"
+    "react": "18",
+    "@emotion/react": "*",
+    "@emotion/styled": "*"
   },
   "module": "./index.esm.js",
   "type": "module",

package/src/lib/components/ConfigurableMapConnect/ConfigurableMapConnect.d.ts

@@ -40,5 +40,6 @@ export interface ConfigurableMapConnectProps {
     displaySearchButtonInMap?: boolean;
     children?: React.ReactNode;
     mapControls?: React.ReactNode;
+    shouldDisablePrefetching?: boolean;
 }
 export declare const ConfigurableMapConnect: React.FC<ConfigurableMapConnectProps>;

package/src/lib/components/MultiMapViewConnect/MultiMapViewConnect.d.ts

@@ -13,6 +13,7 @@ export interface MultiMapPreset {
     displayLayerManagerAndLegendButtonInMap?: boolean;
     displayDimensionSelectButtonInMap?: boolean;
     syncGroupsIds?: string[];
+    componentType?: string;
 }
 export interface MultiMapViewProps {
     rows: number;