@opengeoweb/core 8.0.0 → 8.2.0

package/index.esm.js

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import React__default, { forwardRef, useContext, useCallback, useEffect, createElement, PureComponent, useState, useRef, useLayoutEffect } from 'react';
 import { Grid, Box as Box$2, MenuItem, Typography, useTheme as useTheme$2, Button, Popper, ListItemText, ListItemIcon, FormControl, InputLabel, Paper, List, ListItemButton, CircularProgress, ListSubheader, Dialog, DialogTitle, DialogContent, DialogContentText, TextField, InputAdornment, DialogActions, LinearProgress, Backdrop, ListItem, ListItemSecondaryAction, Checkbox, Switch, styled as styled$1, Slider, Menu, Card, IconButton, Select, CardContent, RadioGroup, FormControlLabel, Radio, ToggleButtonGroup, ToggleButton, Divider, Tooltip, ButtonGroup, Snackbar } from '@mui/material';
-import { CustomIconButton, TooltipSelect, AlertIcon, useControlledTooltip, CustomTooltip, tooltipContainerStyles, sliderHeaderStyle, CustomSlider, ToggleMenu, AlertBanner, CustomAccordion, ToolContainerDraggable, calculateDialogSizeAndPosition, CustomToggleButton, SearchHighlight, dateUtils, useMakeSureContainerStaysInsideWindow, withEggs } from '@opengeoweb/shared';
+import { CustomIconButton, TooltipSelect, AlertIcon, useControlledTooltip, CustomTooltip, tooltipContainerStyles, sliderHeaderStyle, CustomSlider, ToggleMenu, AlertBanner, CustomAccordion, calculateStartSize, ToolContainerDraggable, CustomToggleButton, SearchHighlight, dateUtils, useMakeSureContainerStaysInsideWindow, withEggs } from '@opengeoweb/shared';
 import { CollapseSmall, CollapseMedium, CollapseLarge, CollapseWindow, ExpandWindow, LayersAdd, Copy, None, FastForward, AutoUpdateActive, Both, Visibility, VisibilityOff, Delete, DragHandle as DragHandle$1, Cached, Add, MapAdd, Filter, Search, Clear, Info, DimensionsOther, DimensionsElevation, DimensionsRefTime, DimensionsTime, Edit, Close, Layers, Equalizer, Link, LinkOff, AutoUpdateInActive, Speed, Clock, Now, Animation, Options, Pause, Play, StepForward, StepBackward, dragHandlePath, ChevronDown, ChevronUp, List as List$1, ChevronRight, ChevronLeft, Resize, ExitDomain, ThemeWrapper, lightTheme } from '@opengeoweb/theme';
 import { useDispatch, useSelector, connect, Provider } from 'react-redux';
 import { uiTypes, uiSelectors, uiActions, layerTypes, layerUtils, layerActions, layerSelectors, serviceSelectors, serviceActions, mapSelectors, mapActions, mapEnums, mapConstants, filterLayers, getUserAddedServices, layerSelectSelectors, layerSelectActions, storeUtils, snackbarActions, layerSelectTypes, mapUtils, genericActions, syncConstants, defaultLayers, mapStoreActions, getSingularDrawtoolDrawLayerId, syncGroupsSelectors, syncGroupsSelector, snackbarModuleConfig, snackbarSelectors, coreModuleConfig, routerUtils, routerModuleConfig, appModuleConfig, appActions } from '@opengeoweb/store';
@@ -4664,7 +4664,8 @@ var AcceptanceTime = function AcceptanceTime(_ref) {
     currentIndex: acceptanceTimes.findIndex(function (time) {
       return layerAcceptanceTime === time.value;
     }),
-    IconComponent: icon
+    IconComponent: icon,
+    "data-testid": "acceptanceTimeButton"
   }, /*#__PURE__*/React__default.createElement(MenuItem, {
     disabled: true
   }, "Acc Time"), acceptanceTimes.map(function (accTime) {
@@ -5516,28 +5517,23 @@ var LayerManagerMenuButtonConnect = function LayerManagerMenuButtonConnect(_ref)
     tooltipTitle = _ref.tooltipTitle,
     icon = _ref.icon;
   var dispatch = useDispatch();
-  var layer = useSelector(function (store) {
-    return layerSelectors.getLayerById(store, layerId);
-  });
-  var addLayer = React.useCallback(function (_ref2) {
-    var mapId = _ref2.mapId,
-      layerId = _ref2.layerId,
-      layer = _ref2.layer;
-    return dispatch(layerActions.addLayer({
+  var duplicateLayer = React.useCallback(function (_ref2) {
+    var newLayerId = _ref2.newLayerId,
+      mapId = _ref2.mapId;
+    return dispatch(layerActions.duplicateMapLayer({
       mapId: mapId,
-      layerId: layerId,
-      layer: layer,
+      oldLayerId: layerId,
+      newLayerId: newLayerId,
       origin: layerTypes.LayerActionOrigin.layerManager
     }));
-  }, [dispatch]);
+  }, [dispatch, layerId]);
   return /*#__PURE__*/React.createElement(LayerManagerMenuButton, {
     layerId: layerId,
     mapId: mapId,
     onLayerDuplicate: function onLayerDuplicate() {
-      addLayer({
-        layerId: webmapUtils.generateLayerId(),
-        mapId: mapId,
-        layer: layer
+      duplicateLayer({
+        newLayerId: webmapUtils.generateLayerId(),
+        mapId: mapId
       });
     },
     tooltipTitle: tooltipTitle,
@@ -8971,7 +8967,7 @@ tags.forEach(function (tagName) {
 });
 
 /**
- * @mui/styled-engine v5.14.8
+ * @mui/styled-engine v5.14.10
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the
@@ -10384,10 +10380,10 @@ var ActivateLayerConnect = function ActivateLayerConnect(_ref) {
     }
   }
   var current = getCurrentOptionForLayer(thisLayerHasBoth, thisLayerHasAutoTimestep, thisLayerHasAutoUpdate);
-  var layerTimeDimension = useSelector(function (store) {
-    return layerSelectors.getLayerTimeDimension(store, layerId);
+  var layerHasTimeDimension = useSelector(function (store) {
+    return layerSelectors.getLayerHasTimeDimension(store, layerId);
   });
-  if (!layerTimeDimension) {
+  if (!layerHasTimeDimension) {
     return /*#__PURE__*/React.createElement(CustomTooltip, {
       title: "Layer has no time dimension",
       placement: "top"
@@ -10461,10 +10457,10 @@ var AcceptanceTimeConnect = function AcceptanceTimeConnect(_ref) {
       acceptanceTime: acceptanceTime
     }));
   };
-  var layerTimeDimension = useSelector(function (store) {
-    return layerSelectors.getLayerTimeDimension(store, layerId);
+  var layerHasTimeDimension = useSelector(function (store) {
+    return layerSelectors.getLayerHasTimeDimension(store, layerId);
   });
-  if (!layerTimeDimension) {
+  if (!layerHasTimeDimension) {
     return /*#__PURE__*/React__default.createElement(CustomTooltip, {
       title: "Layer has no time dimension",
       placement: "top"
@@ -11856,15 +11852,6 @@ var styles$6 = {
     boxSizing: 'border-box'
   }
 };
-var calculateStartSize = function calculateStartSize(minSize, prefSize, startPosition) {
-  var _calculateDialogSizeA = calculateDialogSizeAndPosition(),
-    calcWidth = _calculateDialogSizeA.width,
-    calcHeight = _calculateDialogSizeA.height;
-  return {
-    width: Math.max(minSize.width, Math.min(prefSize.width, calcWidth)),
-    height: Math.max(minSize.height, Math.min(prefSize.height, calcHeight - startPosition.top))
-  };
-};
 var LayerManager = function LayerManager(_ref) {
   var mapId = _ref.mapId,
     preloadedAvailableBaseLayers = _ref.preloadedAvailableBaseLayers,
@@ -16601,54 +16588,6 @@ var timestampToPixel = function timestampToPixel(timestamp, centerTime, widthPx,
 var pixelToTimestamp = function pixelToTimestamp(timePx, centerTime, widthPx, secondsPerPx) {
   return centerTime - (widthPx / 2 - timePx) * secondsPerPx;
 };
-var onsetNewDateDebounced = function onsetNewDateDebounced(dateToSet, onSetNewDate) {
-  debounce(function () {
-    onSetNewDate(dateToSet);
-  }, 10, {
-    leading: true
-  })();
-};
-var setNewRoundedTime = function setNewRoundedTime(x, centerTime, width, secondsPerPx, timeStep, dataStartTime, dataEndTime, onSetNewDate) {
-  var unixTime = pixelToTimestamp(x, centerTime, width, secondsPerPx);
-  var roundedTime = mapUtils.roundWithTimeStep(unixTime, timeStep);
-  var maxTime = Math.max(roundedTime, dataStartTime);
-  var newTime = Math.min(maxTime, dataEndTime || roundedTime);
-  var selectedTimeString = moment.unix(newTime).toISOString();
-  onsetNewDateDebounced(selectedTimeString, onSetNewDate);
-};
-var setPreviousTimeStep = function setPreviousTimeStep(timeStep, currentTime, dataStartTime, onSetNewDate) {
-  var nextTime = currentTime - timeStep;
-  var roundedTime = mapUtils.roundWithTimeStep(nextTime, timeStep, 'floor');
-  var newTime = Math.max(roundedTime, dataStartTime || roundedTime);
-  var selectedTimeString = moment.unix(newTime).toISOString();
-  onsetNewDateDebounced(selectedTimeString, onSetNewDate);
-};
-var setNextTimeStep = function setNextTimeStep(timeStep, currentTime, dataEndTime, onSetNewDate) {
-  var nextTime = currentTime + timeStep;
-  var roundedTime = mapUtils.roundWithTimeStep(nextTime, timeStep, 'ceil');
-  var newTime = Math.min(roundedTime, dataEndTime || roundedTime);
-  var selectedTimeString = moment.unix(newTime).toISOString();
-  onsetNewDateDebounced(selectedTimeString, onSetNewDate);
-};
-/**
- * updates unfiltered selected time and moves selected time a given distance
- * in pixels. Unfiltered selected time can be outside data data limits, but
- * selected time cannot.
- */
-var moveSelectedTimePx = function moveSelectedTimePx(x, canvasWidth, centerTime, dataStartTime, dataEndTime, secondsPerPx, timeStep, unfilteredSelectedTime, setUnfilteredSelectedTime, onSetNewDate) {
-  var _map = [dataStartTime, dataEndTime, unfilteredSelectedTime].map(function (timestamp) {
-      return timestampToPixel(timestamp, centerTime, canvasWidth, secondsPerPx);
-    }),
-    _map2 = _slicedToArray(_map, 3),
-    leftMarkerPx = _map2[0],
-    rightMarkerPx = _map2[1],
-    unfilteredSelectedTimePx = _map2[2];
-  setUnfilteredSelectedTime(pixelToTimestamp(unfilteredSelectedTimePx + x, centerTime, canvasWidth, secondsPerPx));
-  var clickedUnfilteredSelectedTimePx = unfilteredSelectedTimePx + x;
-  var minClickedUnfilteredSelectedTimePx = Math.min(clickedUnfilteredSelectedTimePx, rightMarkerPx);
-  var newUnfilteredSelectedTimePx = Math.max(minClickedUnfilteredSelectedTimePx, leftMarkerPx);
-  setNewRoundedTime(newUnfilteredSelectedTimePx, centerTime, canvasWidth, secondsPerPx, timeStep, dataStartTime, dataEndTime, onSetNewDate);
-};
 /**
  * This function creates and returns an array where there is secondsPerPx
  * number of the data set added for a data scale (secondsPerPx)
@@ -16721,24 +16660,6 @@ var AUTO_MOVE_AREA_PADDING = 1;
 var getAutoMoveAreaWidth = function getAutoMoveAreaWidth(scale) {
   return (scale === mapEnums.Scale.Year ? timeBoxGeom.largeWidth + timeBoxGeom.iconWidth : timeBoxGeom.smallWidth + timeBoxGeom.iconWidth) / 2 + AUTO_MOVE_AREA_PADDING;
 };
-/** Reusable business logic for how to handle events that set time to now (closest).
- * Used in NowButton and TimeSliderLegend.
- */
-var handleSetNowEvent = function handleSetNowEvent(timeStep, dataStartTime, dataEndTime, currentTime, onSetNewDate, onSetCenterTime) {
-  if (dataStartTime < dataEndTime) {
-    if (dataEndTime < currentTime) {
-      onSetNewDate(moment.utc(dataEndTime * millisecondsInSecond).toISOString());
-      onSetCenterTime(dataEndTime);
-    } else if (dataStartTime > currentTime) {
-      onSetNewDate(moment.utc(dataStartTime * millisecondsInSecond).toISOString());
-      onSetCenterTime(dataStartTime);
-    } else {
-      var closestToCurrent = mapUtils.roundWithTimeStep(currentTime, timeStep);
-      onSetNewDate(moment.utc(closestToCurrent * millisecondsInSecond).toISOString());
-      onSetCenterTime(closestToCurrent);
-    }
-  }
-};
 var TimeInMinutes;
 (function (TimeInMinutes) {
   TimeInMinutes[TimeInMinutes["YEAR"] = 525600] = "YEAR";
@@ -16839,11 +16760,6 @@ var timeSliderUtils = /*#__PURE__*/Object.freeze({
   timestampToPixelEdges: timestampToPixelEdges,
   timestampToPixel: timestampToPixel,
   pixelToTimestamp: pixelToTimestamp,
-  onsetNewDateDebounced: onsetNewDateDebounced,
-  setNewRoundedTime: setNewRoundedTime,
-  setPreviousTimeStep: setPreviousTimeStep,
-  setNextTimeStep: setNextTimeStep,
-  moveSelectedTimePx: moveSelectedTimePx,
   secondsPerPxValues: secondsPerPxValues,
   secondsPerPxFromCanvasWidth: secondsPerPxFromCanvasWidth,
   getNewCenterOfFixedPointZoom: getNewCenterOfFixedPointZoom,
@@ -16852,7 +16768,6 @@ var timeSliderUtils = /*#__PURE__*/Object.freeze({
   timeBoxGeom: timeBoxGeom,
   AUTO_MOVE_AREA_PADDING: AUTO_MOVE_AREA_PADDING,
   getAutoMoveAreaWidth: getAutoMoveAreaWidth,
-  handleSetNowEvent: handleSetNowEvent,
   get TimeInMinutes () { return TimeInMinutes; },
   minutesToDescribedDuration: minutesToDescribedDuration,
   getFundamentalScale: getFundamentalScale$1
@@ -17211,13 +17126,13 @@ var marks$1 = [{
   value: 12 * 3600,
   text: '12h'
 }, {
-  label: 'day',
+  label: '24 h',
   value: 24 * 3600,
-  text: 'd'
+  text: '24h'
 }, {
-  label: '2 days',
+  label: '48 h',
   value: 2 * 24 * 3600,
-  text: '2d'
+  text: '48h'
 }, {
   label: 'week',
   value: 7 * 24 * 3600,
@@ -17520,7 +17435,7 @@ var OptionsMenuButton = function OptionsMenuButton(_ref) {
     elevation: 3,
     sx: {
       position: 'relative',
-      top: 1
+      top: '-2rem'
     }
   }, /*#__PURE__*/React__default.createElement(Grid, {
     sx: {
@@ -18254,6 +18169,73 @@ var drawTimeSliderLegend = function drawTimeSliderLegend(context, theme, canvasW
   drawNeedle(ctx, theme, canvasWidth, height, visibleTimeStart, visibleTimeEnd, selectedTimeUnix);
 };
 
+var onsetNewDateDebounced = function onsetNewDateDebounced(dateToSet, onSetNewDate) {
+  debounce(function () {
+    onSetNewDate(dateToSet);
+  }, 10, {
+    leading: true
+  })();
+};
+var setPreviousTimeStep = function setPreviousTimeStep(timeStep, currentTime, dataStartTime, onSetNewDate) {
+  var nextTime = currentTime - timeStep;
+  var roundedTime = mapUtils.roundWithTimeStep(nextTime, timeStep, 'floor');
+  var newTime = Math.max(roundedTime, dataStartTime || roundedTime);
+  var selectedTimeString = moment.unix(newTime).toISOString();
+  onsetNewDateDebounced(selectedTimeString, onSetNewDate);
+};
+var setNextTimeStep = function setNextTimeStep(timeStep, currentTime, dataEndTime, onSetNewDate) {
+  var nextTime = currentTime + timeStep;
+  var roundedTime = mapUtils.roundWithTimeStep(nextTime, timeStep, 'ceil');
+  var newTime = Math.min(roundedTime, dataEndTime || roundedTime);
+  var selectedTimeString = moment.unix(newTime).toISOString();
+  onsetNewDateDebounced(selectedTimeString, onSetNewDate);
+};
+/**
+ * updates unfiltered selected time and moves selected time a given distance
+ * in pixels. Unfiltered selected time can be outside data data limits, but
+ * selected time cannot.
+ */
+var moveSelectedTimePx = function moveSelectedTimePx(x, canvasWidth, centerTime, dataStartTime, dataEndTime, secondsPerPx, timeStep, unfilteredSelectedTime, setUnfilteredSelectedTime, onSetNewDate) {
+  var _map = [dataStartTime, dataEndTime, unfilteredSelectedTime].map(function (timestamp) {
+      return timestampToPixel(timestamp, centerTime, canvasWidth, secondsPerPx);
+    }),
+    _map2 = _slicedToArray(_map, 3),
+    leftMarkerPx = _map2[0],
+    rightMarkerPx = _map2[1],
+    unfilteredSelectedTimePx = _map2[2];
+  setUnfilteredSelectedTime(pixelToTimestamp(unfilteredSelectedTimePx + x, centerTime, canvasWidth, secondsPerPx));
+  var clickedUnfilteredSelectedTimePx = unfilteredSelectedTimePx + x;
+  var minClickedUnfilteredSelectedTimePx = Math.min(clickedUnfilteredSelectedTimePx, rightMarkerPx);
+  var newUnfilteredSelectedTimePx = Math.max(minClickedUnfilteredSelectedTimePx, leftMarkerPx);
+  setNewRoundedTime(newUnfilteredSelectedTimePx, centerTime, canvasWidth, secondsPerPx, timeStep, dataStartTime, dataEndTime, onSetNewDate);
+};
+var setNewRoundedTime = function setNewRoundedTime(x, centerTime, width, secondsPerPx, timeStep, dataStartTime, dataEndTime, onSetNewDate) {
+  var unixTime = pixelToTimestamp(x, centerTime, width, secondsPerPx);
+  var roundedTime = mapUtils.roundWithTimeStep(unixTime, timeStep);
+  var maxTime = Math.max(roundedTime, dataStartTime);
+  var newTime = Math.min(maxTime, dataEndTime || roundedTime);
+  var selectedTimeString = moment.unix(newTime).toISOString();
+  onsetNewDateDebounced(selectedTimeString, onSetNewDate);
+};
+/** Reusable business logic for how to handle events that set time to now (closest).
+ * Used in NowButton and TimeSliderLegend.
+ */
+var handleSetNowEvent = function handleSetNowEvent(timeStep, dataStartTime, dataEndTime, currentTime, onSetNewDate, onSetCenterTime) {
+  if (dataStartTime < dataEndTime) {
+    if (dataEndTime < currentTime) {
+      onSetNewDate(moment.utc(dataEndTime * millisecondsInSecond).toISOString());
+      onSetCenterTime(dataEndTime);
+    } else if (dataStartTime > currentTime) {
+      onSetNewDate(moment.utc(dataStartTime * millisecondsInSecond).toISOString());
+      onSetCenterTime(dataStartTime);
+    } else {
+      var closestToCurrent = mapUtils.roundWithTimeStep(currentTime, timeStep);
+      onSetNewDate(moment.utc(closestToCurrent * millisecondsInSecond).toISOString());
+      onSetCenterTime(closestToCurrent);
+    }
+  }
+};
+
 /* *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20199,6 +20181,9 @@ var MapViewConnect = function MapViewConnect(_a) {
   var displayMapPin = useSelector(function (store) {
     return mapSelectors.getDisplayMapPin(store, mapId);
   });
+  var timestep = useSelector(function (store) {
+    return mapSelectors.getMapTimeStep(store, mapId);
+  });
   var dispatch = useDispatch();
   var mapChangeDimension = React.useCallback(function (mapDimensionPayload) {
     if (mapDimensionPayload.dimension) {
@@ -20286,6 +20271,7 @@ var MapViewConnect = function MapViewConnect(_a) {
     dimensions: mapDimensions,
     activeLayerId: activeLayerId,
     animationDelay: animationDelay,
+    timestep: timestep,
     displayMapPin: displayMapPin,
     disableMapPin: disableMapPin,
     onMapChangeDimension: function onMapChangeDimension(mapDimensionPayload) {
@@ -20343,7 +20329,7 @@ var MapViewConnect = function MapViewConnect(_a) {
         });
       },
       onClickFeature: layer.geojson ? function (event) {
-        if ((event === null || event === void 0 ? void 0 : event.isInEditMode) === false) {
+        if (Boolean(event === null || event === void 0 ? void 0 : event.isInEditMode) === false) {
           setSelectedFeature({
             layerId: layer.id,
             selectedFeatureIndex: event === null || event === void 0 ? void 0 : event.featureIndex
@@ -27141,7 +27127,7 @@ var CoreThemeStoreProvider = function CoreThemeStoreProvider(_ref3) {
 };
 
 /**
- * @remix-run/router v1.8.0
+ * @remix-run/router v1.9.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -27205,7 +27191,7 @@ function warning(cond, message) {
     try {
       // Welcome to debugging history!
       //
-      // This error is thrown as a convenience so you can more easily
+      // This error is thrown as a convenience, so you can more easily
       // find the source for a warning that appears in the console by
       // enabling "pause on exceptions" in your JavaScript debugger.
       throw new Error(message);
@@ -27381,7 +27367,7 @@ const validMutationMethodsArr = ["post", "put", "patch", "delete"];
 ["get", ...validMutationMethodsArr];
 
 /**
- * React Router v6.15.0
+ * React Router v6.16.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "8.0.0",
+  "version": "8.2.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -13,14 +13,14 @@
   "dependencies": {},
   "peerDependencies": {
     "@mui/material": "5.12.0",
-    "@mui/system": "5.14.8",
-    "@opengeoweb/api": "8.0.0",
-    "@opengeoweb/form-fields": "8.0.0",
-    "@opengeoweb/shared": "8.0.0",
-    "@opengeoweb/store": "8.0.0",
-    "@opengeoweb/theme": "8.0.0",
-    "@opengeoweb/webmap": "8.0.0",
-    "@opengeoweb/webmap-react": "8.0.0",
+    "@mui/system": "5.14.10",
+    "@opengeoweb/api": "8.2.0",
+    "@opengeoweb/form-fields": "8.2.0",
+    "@opengeoweb/shared": "8.2.0",
+    "@opengeoweb/store": "8.2.0",
+    "@opengeoweb/theme": "8.2.0",
+    "@opengeoweb/webmap": "8.2.0",
+    "@opengeoweb/webmap-react": "8.2.0",
     "@redux-eggs/redux-toolkit": "2.2.0",
     "@redux-eggs/saga-extension": "2.2.0",
     "@reduxjs/toolkit": "1.9.5",
@@ -34,10 +34,10 @@
     "re-resizable": "6.9.11",
     "react": "18.2.0",
     "react-draggable": "4.4.5",
-    "react-hook-form": "7.46.1",
+    "react-hook-form": "7.46.2",
     "react-i18next": "13.2.2",
     "react-redux": "8.1.2",
-    "react-router-dom": "6.15.0",
+    "react-router-dom": "6.16.0",
     "react-sortablejs": "6.1.4",
     "react-window": "1.8.9",
     "redux-saga": "1.2.3",