@opengeoweb/core 20.0.1 → 20.1.0

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
@@ -10302,14 +10284,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 +10296,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);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opengeoweb/core",
-    "version": "20.0.1",
+    "version": "20.1.0",
     "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",
         "react-redux": "^9.2.0",
-        "@opengeoweb/store": "20.0.1",
-        "@opengeoweb/time-slider": "20.0.1",
+        "@opengeoweb/store": "20.1.0",
+        "@opengeoweb/time-slider": "20.1.0",
         "@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",
+        "@opengeoweb/webmap": "20.1.0",
+        "@opengeoweb/theme": "20.1.0",
+        "@opengeoweb/layer-select": "20.1.0",
         "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",
         "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",
         "@types/geojson": "^7946.0.14",
         "@turf/turf": "^7.2.0",
         "proj4": "^2.15.0",