@opengeoweb/core 20.0.1 → 20.1.0-nightly-20261018

package/dist/index.esm.js

@@ -1,7 +1,7 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { FormControl, MenuItem, Grid, InputLabel, Paper, Box, Typography, CircularProgress, List, ListSubheader, ListItemButton, ListItemText, DialogContentText, TextField, InputAdornment, Button, useTheme, Tooltip, ListItem, ListItemIcon, Checkbox, Popper, Fade, styled, LinearProgress, Autocomplete, Switch, Select } from '@mui/material';
 import React, { useMemo, useState, useCallback, useEffect, useContext } from 'react';
-import { safelyInitI18nForTestsAndStories, sharedTranslations, SHARED_NAMESPACE, TooltipSelect, CustomIconButton, CustomDialog, CustomTooltip, ToggleMenu, AlertIcon, useConfirmationDialog, useScrollingInIsolation, sliderHeaderStyle, CustomSlider, SearchField, SearchHighlight, tooltipContainerStyles, renderCounter, AlertBanner, CustomAccordion, PROJECTION, calculateStartSize, useWheelStopPropagation, ToolContainerDraggable, useDebounce, dateUtils, sessionStorageProvider, usePrevious } from '@opengeoweb/shared';
+import { safelyInitI18nForTestsAndStories, sharedTranslations, SHARED_NAMESPACE, TooltipSelect, CustomIconButton, CustomDialog, CustomTooltip, ToggleMenu, AlertIcon, useScrollingInIsolation, sliderHeaderStyle, CustomSlider, SearchField, SearchHighlight, tooltipContainerStyles, renderCounter, AlertBanner, CustomAccordion, PROJECTION, calculateStartSize, useWheelStopPropagation, ToolContainerDraggable, useDebounce, dateUtils, sessionStorageProvider, usePrevious } from '@opengeoweb/shared';
 import { webmapUtils, queryWMSLayersTree, invalidateWMSGetCapabilities, LayerType, WMJSDimension, WMDefaultStyleName, queryWMSServiceInfo, queryWMSLayers, getWMSServiceId, handleDateUtilsISOString, generateLayerId, getWMLayerById, getMapDimURL, WMLayer } from '@opengeoweb/webmap';
 import _, { isEqual, isArray, range, zip, throttle } from 'lodash';
 import { useDispatch, useSelector, connect, useStore, shallowEqual, Provider } from 'react-redux';
@@ -129,10 +129,6 @@ var en = {
 	"featureinfo-title": "Feature info",
 	"featureinfo-id": "ID",
 	"featureinfo-location": "Location",
-	"delete-dialog-title": "Delete layer",
-	"delete-dialog-description": "Are you sure you want to delete this layer? EDR layers are not yet available in the Layer Select.",
-	"delete-dialog-cancel": "Cancel",
-	"delete-dialog-confirm": "Delete",
 	"map-options-button": "Location or Measuring tool",
 	"map-measure-tool": "Measuring tool",
 	"data-outdated": "Outdated data"
@@ -410,10 +406,6 @@ var nl = {
 	"featureinfo-title": "niet vertaald",
 	"featureinfo-id": "niet vertaald",
 	"featureinfo-location": "niet vertaald",
-	"delete-dialog-title": "Laag verwijderen",
-	"delete-dialog-description": "Weet je zeker dat je deze laag wilt verwijderen? EDR lagen zijn nog niet beschikbaar in de Layer Select.",
-	"delete-dialog-cancel": "Annuleren",
-	"delete-dialog-confirm": "Verwijderen",
 	"map-options-button": "Locatie informatie en Meten",
 	"map-measure-tool": "Meten",
 	"data-outdated": "Data is niet actueel"
@@ -2951,14 +2943,10 @@ var DeleteLayerConnect = function DeleteLayerConnect(_ref) {
   var _useCoreTranslation = useCoreTranslation(),
     t = _useCoreTranslation.t;
   var dispatch = useDispatch();
-  var confirmationDialog = useConfirmationDialog();
   var nonEmptyTooltipTitle = tooltipTitle != null ? tooltipTitle : t('layermanager-layer-delete');
   var layerIndex = useSelector(function (store) {
     return mapSelectors.getLayerIndexByLayerId(store, mapId, layerId);
   });
-  var layerType = useSelector(function (store) {
-    return layerSelectors.getLayerType(store, layerId);
-  });
   var isFeatureSyncLayer = useSelector(function (store) {
     return layerSelectors.getIsFeatureSyncLayer(store, layerId);
   });
@@ -2978,28 +2966,13 @@ var DeleteLayerConnect = function DeleteLayerConnect(_ref) {
   var onDelete = React.useCallback(function (_ref3) {
     var mapId = _ref3.mapId,
       layerId = _ref3.layerId;
-    if (isFeatureSyncLayer) {
-      return;
-    }
-    if (layerType === LayerType.edrFeatureLayer) {
-      void confirmationDialog({
-        title: t('delete-dialog-title'),
-        description: t('delete-dialog-description'),
-        confirmLabel: t('delete-dialog-confirm'),
-        cancelLabel: t('delete-dialog-cancel')
-      }).then(function () {
-        layerDelete({
-          mapId: mapId,
-          layerId: layerId
-        });
-      });
-    } else {
+    if (!isFeatureSyncLayer) {
       layerDelete({
         mapId: mapId,
         layerId: layerId
       });
     }
-  }, [isFeatureSyncLayer, layerType, confirmationDialog, t, layerDelete]);
+  }, [isFeatureSyncLayer, layerDelete]);
   return jsx(CustomIconButton, {
     "data-testid": "deleteButton",
     disabled: isFeatureSyncLayer,
@@ -4838,7 +4811,12 @@ var RenderLayersConnect = function RenderLayersConnect(_ref) {
   var serviceUrl = useSelector(function (store) {
     return layerSelectors.getLayerService(store, layerId);
   });
-  var resolvedServiceUrl = isStacGeoTIFFLayer ? layerUtils.getSTACServiceRootUrl(serviceUrl) : serviceUrl;
+  var resolvedServiceUrl = serviceUrl;
+  if (isStacGeoTIFFLayer) {
+    resolvedServiceUrl = layerUtils.getSTACServiceRootUrl(serviceUrl);
+  } else if (isEdrLayer) {
+    resolvedServiceUrl = layerUtils.getEDRServiceRootUrl(serviceUrl);
+  }
   var isLayerEnabled = useSelector(function (store) {
     return layerSelectors.getLayerEnabled(store, layerId);
   });
@@ -4846,10 +4824,14 @@ var RenderLayersConnect = function RenderLayersConnect(_ref) {
     return layerSelectors.getLayerStyle(store, layerId);
   });
   var service = useSelector(function (store) {
-    if (!isStacGeoTIFFLayer) {
+    if (!isStacGeoTIFFLayer && !isEdrLayer) {
       return serviceSelectors.getServiceByUrl(store, serviceUrl);
     }
-    return serviceSelectors.getServiceByUrl(store, resolvedServiceUrl) || serviceSelectors.getServiceByUrl(store, layerUtils.getTrailingSlashVariant(resolvedServiceUrl));
+    var rootService = serviceSelectors.getServiceByUrl(store, resolvedServiceUrl) || serviceSelectors.getServiceByUrl(store, layerUtils.getTrailingSlashVariant(resolvedServiceUrl));
+    if (rootService) {
+      return rootService;
+    }
+    return isEdrLayer ? serviceSelectors.getServiceByUrl(store, serviceUrl) : undefined;
   });
   var layerOptions = useSelector(function (store) {
     return layerSelectors.getLayerOptions(store, layerId);
@@ -4973,6 +4955,7 @@ var RenderLayersConnect = function RenderLayersConnect(_ref) {
       "abstract": data.description,
       layers: layers,
       scope: 'system',
+      isUpdating: true,
       type: 'EDR'
     });
   }, [data, serviceUrl, service, serviceSetLayers]);
@@ -5169,7 +5152,7 @@ var hasMatchingSTACLayerServiceUrl = function hasMatchingSTACLayerServiceUrl(lay
   return !isSTACCollectionUrl(layerInfoServiceUrl) && hasSameSTACServiceUrl(layerServiceUrl, layerInfoServiceUrl);
 };
 var LayerInfoDialogConnect = function LayerInfoDialogConnect(_ref) {
-  var _layerInfo$serviceUrl, _selectedMapLayer$ser, _currentService$layer;
+  var _layerInfo$serviceUrl, _selectedMapLayer$ser, _currentService$layer, _selectedMapLayer$opt;
   var source = _ref.source,
     mapId = _ref.mapId;
   var dispatch = useDispatch();
@@ -5229,6 +5212,7 @@ var LayerInfoDialogConnect = function LayerInfoDialogConnect(_ref) {
     return null;
   }
   return jsx(LayerInfoDialog, {
+    edrParameterMetadata: (selectedMapLayer == null ? void 0 : selectedMapLayer.layerType) === LayerType.edrFeatureLayer ? (_selectedMapLayer$opt = selectedMapLayer.options) == null ? void 0 : _selectedMapLayer$opt.parameterMetadata : undefined,
     isOpen: isDialogOpen,
     layer: layer,
     onClose: onCloseDialog,
@@ -6620,22 +6604,20 @@ var AnimationLengthPanelConnect = function AnimationLengthPanelConnect(_ref) {
   var timeStep = useSelector(function (store) {
     return mapSelectors.getMapTimeStep(store, mapId);
   });
-  var layerRefTimeDimension = useSelector(function (store) {
-    return layerSelectors.getLayerDimension(store, autoTimeStepLayerId, 'reference_time');
+  var anchorInputs = useSelector(function (store) {
+    return mapSelectors.getAnimationAnchorInputs(store, mapId);
   });
-  var referenceTimeFromLayer = (layerRefTimeDimension == null ? void 0 : layerRefTimeDimension.currentValue) || undefined;
-  var anchorTime = dateUtils.utc(referenceTimeFromLayer);
   var commitAnimationLength = React.useCallback(function (length) {
-    var isUsableRange = isValidAnimationLength(length) && isWithinAnimationStepLimit(length, timeStep);
+    var isUsableRange = isValidAnimationLength(length, anchorInputs) && isWithinAnimationStepLimit(length, timeStep, anchorInputs);
     var carriesOwnRange = isAnchoredMode(length.mode) || length.mode === AnimationLengthMode.Exact;
-    var resolvedRange = carriesOwnRange && isUsableRange ? settingRange(length, anchorTime) : undefined;
+    var resolvedRange = carriesOwnRange && isUsableRange ? settingRange(length, anchorInputs) : undefined;
     dispatch(mapActions.setAnimationLength(Object.assign({
       mapId: mapId,
       animationLength: length
     }, resolvedRange, {
       origin: mapEnums.MapActionOrigin.map
     })));
-  }, [anchorTime, dispatch, mapId, timeStep]);
+  }, [anchorInputs, dispatch, mapId, timeStep]);
   React.useEffect(function () {
     if (debouncedLength && isCommittableRef.current) {
       commitAnimationLength(debouncedLength);
@@ -6651,11 +6633,11 @@ var AnimationLengthPanelConnect = function AnimationLengthPanelConnect(_ref) {
       return;
     }
     if (isStep) {
-      var isUsableRange = isValidAnimationLength(animationLength) && isWithinAnimationStepLimit(animationLength, timeStep);
+      var isUsableRange = isValidAnimationLength(animationLength, anchorInputs) && isWithinAnimationStepLimit(animationLength, timeStep, anchorInputs);
       if (isUsableRange) {
         dispatch(mapActions.refreshAnimationRange(Object.assign({
           mapId: mapId
-        }, settingRange(animationLength, anchorTime))));
+        }, settingRange(animationLength, anchorInputs))));
       }
     }
   };
@@ -6669,7 +6651,7 @@ var AnimationLengthPanelConnect = function AnimationLengthPanelConnect(_ref) {
     isAutoDisabled: !timeStepFromLayer,
     onChange: changeAnimationLength,
     onInputChange: cancelPendingCommit,
-    referenceTimeFromLayer: referenceTimeFromLayer,
+    referenceTimeFromLayer: anchorInputs.referenceTime,
     setting: (_ref2 = draftLength != null ? draftLength : storedAnimationLength) != null ? _ref2 : exactAnimationLengthFrom({
       animationStartTime: animationStartTime,
       animationEndTime: animationEndTime
@@ -7548,6 +7530,31 @@ var LocationSearch = function LocationSearch(_ref) {
       document.removeEventListener('keydown', handleKeyDown);
     };
   }, [dropdownOpen, isOpen]);
+  // Always pass groupBy/renderGroup, and only group when the input is empty.
+  // MUI keeps rendering the last open options while the popup closes, so
+  // toggling groupBy in between makes it read flat options as groups and crash.
+  var groupProps = {
+    groupBy: function groupBy(option) {
+      return debouncedInputValue.trim() === '' && 'groupHeader' in option && typeof option.groupHeader === 'string' ? option.groupHeader : '';
+    },
+    renderGroup: function renderGroup(params) {
+      return jsxs(React.Fragment, {
+        children: [params.group ? jsx(ListSubheader, {
+          disableSticky: true,
+          sx: {
+            color: theme.palette.primary.main,
+            fontWeight: 400,
+            fontSize: '16px',
+            py: 1,
+            my: 0,
+            minHeight: '26px',
+            lineHeight: 1
+          },
+          children: params.group
+        }) : null, Array.isArray(params.children) ? params.children : [params.children]]
+      }, params.key);
+    }
+  };
   return isOpen && mapId ? jsxs(Box, {
     sx: {
       display: 'flex',
@@ -7611,28 +7618,7 @@ var LocationSearch = function LocationSearch(_ref) {
           paddingTop: '20px'
         }
       }
-    }, debouncedInputValue.trim() === '' ? {
-      groupBy: function groupBy(option) {
-        return 'groupHeader' in option && typeof option.groupHeader === 'string' ? option.groupHeader : '';
-      },
-      renderGroup: function renderGroup(params) {
-        return jsxs(React.Fragment, {
-          children: [jsx(ListSubheader, {
-            disableSticky: true,
-            sx: {
-              color: theme.palette.primary.main,
-              fontWeight: 400,
-              fontSize: '16px',
-              py: 1,
-              my: 0,
-              minHeight: '26px',
-              lineHeight: 1
-            },
-            children: params.group
-          }), Array.isArray(params.children) ? params.children : [params.children]]
-        }, params.key);
-      }
-    } : {}, {
+    }, groupProps, {
       /* eslint-disable @typescript-eslint/no-explicit-any */
       clearIcon: null,
       inputValue: inputValue,
@@ -10302,14 +10288,11 @@ var TimeSliderLegendConnect = function TimeSliderLegendConnect(_ref) {
   var animationLength = useSelector(function (store) {
     return mapSelectors.getAnimationLength(store, mapId);
   });
-  var autoTimeStepLayerId = useSelector(function (store) {
-    return mapSelectors.getAutoTimeStepLayerId(store, mapId);
-  });
-  var layerRefTimeDimension = useSelector(function (store) {
-    return layerSelectors.getLayerDimension(store, autoTimeStepLayerId, 'reference_time');
+  var anchorInputs = useSelector(function (store) {
+    return mapSelectors.getAnimationAnchorInputs(store, mapId);
   });
   /* ReferenceTime counts its offsets from the layer, so the reducer is told where that is. */
-  var referenceTimeFromLayer = (layerRefTimeDimension == null ? void 0 : layerRefTimeDimension.currentValue) || undefined;
+  var referenceTimeFromLayer = anchorInputs.referenceTime;
   /* An anchored mode counts whole units from its anchor, so a handle may only land on those. */
   var snapAnimationTime = React.useMemo(function () {
     if (!animationLength || !isAnchoredMode(animationLength.mode)) {
@@ -10317,9 +10300,9 @@ var TimeSliderLegendConnect = function TimeSliderLegendConnect(_ref) {
     }
     var unit = activeEditUnit(animationLength);
     return function (timeUnix) {
-      return dateUtils.unix(snapInstantToOffsetGrid(anchorInstantFor(animationLength, referenceTimeFromLayer), dateUtils.fromUnix(timeUnix), unit));
+      return dateUtils.unix(snapInstantToOffsetGrid(anchorInstantFor(animationLength, anchorInputs), dateUtils.fromUnix(timeUnix), unit));
     };
-  }, [animationLength, referenceTimeFromLayer]);
+  }, [animationLength, anchorInputs]);
   var currentTime = dateUtils.unix(Date.now());
   var _useSelector2 = useSelector(function (store) {
       return mapSelectors.getDataLimitsFromLayers(store, mapId);
@@ -10511,6 +10494,7 @@ var useUpdateTimeSpan = function useUpdateTimeSpan(mapId, myOnSetTimeSliderSpan)
   var activeLayerTimeDimension = useSelector(function (store) {
     return layerSelectors.getLayerTimeDimension(store, autoTimeStepLayerId);
   });
+  var hasActiveLayerTimeDimension = Boolean(activeLayerTimeDimension);
   var timeSliderWidth = useSelector(function (store) {
     return mapSelectors.getMapTimeSliderWidth(store, mapId);
   });
@@ -10529,6 +10513,24 @@ var useUpdateTimeSpan = function useUpdateTimeSpan(mapId, myOnSetTimeSliderSpan)
   var isAnimating = useSelector(function (store) {
     return mapSelectors.isAnimating(store, mapId);
   });
+  var _React$useState = React.useState(function () {
+      return Math.floor(Date.now() / 1000);
+    }),
+    now = _React$useState[0],
+    setNow = _React$useState[1];
+  var updateNow = React.useCallback(function () {
+    setNow(Math.floor(Date.now() / 1000));
+  }, []);
+  React.useEffect(function () {
+    if (!isTimeSpanAuto || !autoTimeStepLayerId || !hasActiveLayerTimeDimension) {
+      return undefined;
+    }
+    updateNow();
+    var intervalId = window.setInterval(updateNow, 60 * 1000);
+    return function () {
+      return window.clearInterval(intervalId);
+    };
+  }, [autoTimeStepLayerId, hasActiveLayerTimeDimension, isTimeSpanAuto, updateNow]);
   var updateTimeSliderSpan = React.useCallback(function (spanInSeconds, newCenterTime) {
     // Do not dispatch actions if values are the same
     if (spanInSeconds !== undefined && newCenterTime !== undefined && (currentTimeSpan !== spanInSeconds || centerTime !== newCenterTime)) {
@@ -10536,14 +10538,28 @@ var useUpdateTimeSpan = function useUpdateTimeSpan(mapId, myOnSetTimeSliderSpan)
     }
   }, [centerTime, currentTimeSpan, myOnSetTimeSliderSpan]);
   React.useEffect(function () {
+    if (isTimeSpanAuto && isAnimating) {
+      return;
+    }
     if (isTimeSpanAuto && autoTimeStepLayerId && activeLayerTimeDimension && !isAnimating) {
       var _getTimeBounds = getTimeBounds([activeLayerTimeDimension]),
         startTime = _getTimeBounds.startTime,
         endTime = _getTimeBounds.endTime;
-      var minimumStartTime = selectedTime - 24 * 3600;
-      var slicedStartTime = startTime < minimumStartTime ? minimumStartTime : startTime;
-      var spanInSeconds = endTime - slicedStartTime;
-      var newCenterTime = (slicedStartTime + endTime) / 2;
+      var oneDayInSeconds = 24 * 3600;
+      var slicedStartTime;
+      var slicedEndTime;
+      if (now < startTime) {
+        slicedStartTime = now;
+        slicedEndTime = now + oneDayInSeconds;
+      } else if (now > endTime) {
+        slicedStartTime = now - oneDayInSeconds;
+        slicedEndTime = now;
+      } else {
+        slicedStartTime = Math.max(startTime, now - oneDayInSeconds);
+        slicedEndTime = now;
+      }
+      var spanInSeconds = slicedEndTime - slicedStartTime;
+      var newCenterTime = (slicedStartTime + slicedEndTime) / 2;
       updateTimeSliderSpan(spanInSeconds, newCenterTime);
     } else {
       var _spanInSeconds = currentTimeSpan || defaultTimeSpan;
@@ -10551,7 +10567,7 @@ var useUpdateTimeSpan = function useUpdateTimeSpan(mapId, myOnSetTimeSliderSpan)
       updateTimeSliderSpan(_spanInSeconds, _newCenterTime);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [autoTimeStepLayerId, isTimeSpanAuto, mapId, activeLayerTimeDimension == null ? void 0 : activeLayerTimeDimension.name]);
+  }, [autoTimeStepLayerId, isAnimating, isTimeSpanAuto, mapId, activeLayerTimeDimension == null ? void 0 : activeLayerTimeDimension.name, now]);
 };
 var timeToIso = function timeToIso(selectedTime) {
   return handleDateUtilsISOString(dateUtils.fromUnix(selectedTime).toISOString());
@@ -10625,9 +10641,9 @@ var TimeSliderConnect = function TimeSliderConnect(_ref) {
   useUpdateTimestep(mapId);
   useUpdateTimeSpan(mapId, onSetTimeSliderSpan);
   // Local state for unfiltered selected time
-  var _React$useState = React.useState(selectedTime),
-    unfilteredSelectedTime = _React$useState[0],
-    setUnfilteredSelectedTime = _React$useState[1];
+  var _React$useState2 = React.useState(selectedTime),
+    unfilteredSelectedTime = _React$useState2[0],
+    setUnfilteredSelectedTime = _React$useState2[1];
   // Store unfilteredSelectedTime in a ref for callbacks
   var unfilteredSelectedTimeRef = React.useRef(unfilteredSelectedTime);
   React.useEffect(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opengeoweb/core",
-    "version": "20.0.1",
+    "version": "20.1.0-nightly-20261018",
     "description": "GeoWeb Core library for the opengeoweb project",
     "license": "Apache-2.0",
     "repository": {
@@ -20,28 +20,28 @@
         }
     },
     "dependencies": {
-        "@opengeoweb/shared": "20.0.1",
+        "@opengeoweb/shared": "20.1.0-nightly-20261018",
         "react-redux": "^9.2.0",
-        "@opengeoweb/store": "20.0.1",
-        "@opengeoweb/time-slider": "20.0.1",
+        "@opengeoweb/store": "20.1.0-nightly-20261018",
+        "@opengeoweb/time-slider": "20.1.0-nightly-20261018",
         "@reduxjs/toolkit": "^2.6.1",
-        "@opengeoweb/webmap-react": "20.0.1",
-        "@opengeoweb/webmap": "20.0.1",
-        "@opengeoweb/theme": "20.0.1",
-        "@opengeoweb/layer-select": "20.0.1",
+        "@opengeoweb/webmap-react": "20.1.0-nightly-20261018",
+        "@opengeoweb/webmap": "20.1.0-nightly-20261018",
+        "@opengeoweb/theme": "20.1.0-nightly-20261018",
+        "@opengeoweb/layer-select": "20.1.0-nightly-20261018",
         "lodash": "^4.18.1",
         "ol": "^10.4.0",
         "react-sortablejs": "^6.1.4",
         "sortablejs": "^1.15.1",
         "@mui/system": "^9.0.1",
-        "@opengeoweb/snackbar": "20.0.1",
+        "@opengeoweb/snackbar": "20.1.0-nightly-20261018",
         "react-draggable": "^4.4.6",
         "i18next": "^25.0.1",
         "react-i18next": "^15.1.1",
         "dompurify": "^3.4.13",
         "@mui/material": "^9.0.1",
         "@tanstack/react-query": "^5.85.5",
-        "@opengeoweb/api": "20.0.1",
+        "@opengeoweb/api": "20.1.0-nightly-20261018",
         "@types/geojson": "^7946.0.14",
         "@turf/turf": "^7.2.0",
         "proj4": "^2.15.0",