@opengeoweb/store 9.5.0 → 9.7.0

package/index.esm.js

@@ -3,8 +3,8 @@ import { webmapUtils, LayerType, webmapTestSettings, WMLayer, handleMomentISOStr
 import { createAction, createSlice, createSelector, createEntityAdapter, current as current$1 } from '@reduxjs/toolkit';
 import { getGeoJson, moveFeature, createInterSections, defaultLayers, getFeatureCollection, emptyGeoJSON, defaultIntersectionStyleProperties } from '@opengeoweb/webmap-react';
 export { defaultLayers } from '@opengeoweb/webmap-react';
-import moment from 'moment';
-import { differenceInMinutes, getUnixTime, parseISO, isValid, fromUnixTime } from 'date-fns';
+import { differenceInMinutes, isValid, fromUnixTime } from 'date-fns';
+import { dateUtils, withEggs } from '@opengeoweb/shared';
 import { isEqual, compact } from 'lodash';
 import { createStore as createStore$1 } from '@redux-eggs/redux-toolkit';
 import { getSagaExtension } from '@redux-eggs/saga-extension';
@@ -12,7 +12,6 @@ import { takeEvery, takeLatest, put, select, call, all, delay } from 'redux-saga
 import React, { useCallback, useEffect } from 'react';
 import { Provider, useDispatch, useSelector } from 'react-redux';
 import { ThemeWrapper, lightTheme } from '@opengeoweb/theme';
-import { withEggs } from '@opengeoweb/shared';
 
 function _iterableToArrayLimit(r, l) {
   var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
@@ -557,15 +556,19 @@ var constants$1 = /*#__PURE__*/Object.freeze({
   IS_LEGEND_OPEN_BY_DEFAULT: IS_LEGEND_OPEN_BY_DEFAULT
 });
 
-var dateFormat = 'YYYY-MM-DDTHH:mm:ss[Z]';
+var dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z";
 var createMap = function createMap(_ref) {
   var id = _ref.id,
     _ref$isAnimating = _ref.isAnimating,
     isAnimating = _ref$isAnimating === void 0 ? false : _ref$isAnimating,
     _ref$animationStartTi = _ref.animationStartTime,
-    animationStartTime = _ref$animationStartTi === void 0 ? moment.utc(moment().unix() * 1000).subtract(5, 'h').format(dateFormat) : _ref$animationStartTi,
+    animationStartTime = _ref$animationStartTi === void 0 ? dateUtils.dateToString(dateUtils.sub(dateUtils.fromUnix(dateUtils.unix(dateUtils.utc())), {
+      hours: 5
+    }), dateFormat) : _ref$animationStartTi,
     _ref$animationEndTime = _ref.animationEndTime,
-    animationEndTime = _ref$animationEndTime === void 0 ? moment.utc(moment().unix() * 1000).subtract(10, 'm').format(dateFormat) : _ref$animationEndTime,
+    animationEndTime = _ref$animationEndTime === void 0 ? dateUtils.dateToString(dateUtils.sub(dateUtils.fromUnix(dateUtils.unix(dateUtils.utc())), {
+      minutes: 10
+    }), dateFormat) : _ref$animationEndTime,
     _ref$isAutoUpdating = _ref.isAutoUpdating,
     isAutoUpdating = _ref$isAutoUpdating === void 0 ? false : _ref$isAutoUpdating,
     _ref$isEndTimeOverrid = _ref.isEndTimeOverriding,
@@ -600,7 +603,7 @@ var createMap = function createMap(_ref) {
     _ref$timeSliderWidth = _ref.timeSliderWidth,
     timeSliderWidth = _ref$timeSliderWidth === void 0 ? 440 : _ref$timeSliderWidth,
     _ref$timeSliderCenter = _ref.timeSliderCenterTime,
-    timeSliderCenterTime = _ref$timeSliderCenter === void 0 ? moment.utc().unix() : _ref$timeSliderCenter,
+    timeSliderCenterTime = _ref$timeSliderCenter === void 0 ? dateUtils.unix(dateUtils.utc()) : _ref$timeSliderCenter,
     _ref$timeSliderSecond = _ref.timeSliderSecondsPerPx,
     timeSliderSecondsPerPx = _ref$timeSliderSecond === void 0 ? defaultSecondsPerPx : _ref$timeSliderSecond,
     _ref$isTimestepAuto = _ref.isTimestepAuto,
@@ -792,9 +795,6 @@ var getTimeStepFromDataInterval = function getTimeStepFromDataInterval(timeInter
       return defaultTimeStep;
   }
 };
-var getActiveLayerTimeStep = function getActiveLayerTimeStep(timeDimension) {
-  return (timeDimension === null || timeDimension === void 0 ? void 0 : timeDimension.timeInterval) ? getTimeStepFromDataInterval(timeDimension.timeInterval) : undefined;
-};
 var getSpeedFactor = function getSpeedFactor(speedDelay) {
   return defaultDelay / speedDelay;
 };
@@ -852,7 +852,6 @@ var utils$3 = /*#__PURE__*/Object.freeze({
   produceDraftStateSetMapDimensionFromLayerChangeDimension: produceDraftStateSetMapDimensionFromLayerChangeDimension,
   moveArrayElements: moveArrayElements,
   getTimeStepFromDataInterval: getTimeStepFromDataInterval,
-  getActiveLayerTimeStep: getActiveLayerTimeStep,
   getSpeedFactor: getSpeedFactor,
   getAnimationDuration: getAnimationDuration,
   getSpeedDelay: getSpeedDelay,
@@ -2077,6 +2076,12 @@ var getLayerIsInsideAcceptanceTime = createSelector(getAcceptanceTimeInMinutes,
 var getUseLatestReferenceTime = createSelector(getLayerById, function (layer) {
   return Boolean(layer === null || layer === void 0 ? void 0 : layer.useLatestReferenceTime);
 }, selectorMemoizationOptions);
+/**
+ * Returns the timestep for this layerId in seconds, or undefined if it has no time dimension or timeinterval.
+ */
+var getTimeStepForLayerId = createSelector(getLayerTimeDimension, function (timeDimension) {
+  return timeDimension && timeDimension.timeInterval ? getTimeStepFromDataInterval(timeDimension.timeInterval) : undefined;
+}, selectorMemoizationOptions);
 
 var selectors$6 = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -2110,7 +2115,8 @@ var selectors$6 = /*#__PURE__*/Object.freeze({
   getDimensionLayerIds: getDimensionLayerIds,
   getAcceptanceTimeInMinutes: getAcceptanceTimeInMinutes,
   getLayerIsInsideAcceptanceTime: getLayerIsInsideAcceptanceTime,
-  getUseLatestReferenceTime: getUseLatestReferenceTime
+  getUseLatestReferenceTime: getUseLatestReferenceTime,
+  getTimeStepForLayerId: getTimeStepForLayerId
 });
 
 /* *
@@ -4058,13 +4064,13 @@ var getMapDimension = createSelector([getMapById, function (_store, mapId) {
 var getSelectedTime = createSelector(function (store, mapId) {
   return getMapDimension(store, mapId, 'time');
 }, function (timeDimension) {
-  var now = getUnixTime(new Date());
+  var now = dateUtils.unix(new Date());
   if (!timeDimension) {
     return now;
   }
-  var timeSliderTime = parseISO(timeDimension.currentValue);
-  if (isValid(timeSliderTime)) {
-    return getUnixTime(timeSliderTime);
+  var timeSliderTime = dateUtils.parseISO(timeDimension.currentValue);
+  if (dateUtils.isValid(timeSliderTime)) {
+    return dateUtils.unix(timeSliderTime);
   }
   return now;
 }, selectorMemoizationOptions);
@@ -4078,8 +4084,8 @@ var getDataLimitsFromLayers = createSelector(getMapLayers, function (layers) {
       return dimension.name === 'time';
     });
     if ((dimension === null || dimension === void 0 ? void 0 : dimension.minValue) && dimension.maxValue) {
-      var lastValue = getUnixTime(new Date(dimension.maxValue));
-      var firstValue = getUnixTime(new Date(dimension.minValue));
+      var lastValue = dateUtils.unix(new Date(dimension.maxValue));
+      var firstValue = dateUtils.unix(new Date(dimension.minValue));
       var newLast = Math.max(lastValue, end);
       var newFirst = Math.min(firstValue, start);
       return [newFirst, newLast];
@@ -4161,7 +4167,9 @@ var linkedMapAnimationInfo = createSelector(function (store, mapId) {
  * @returns {string} returnType: string
  */
 var getAnimationStartTime = createSelector(getMapById, function (store) {
-  return (store === null || store === void 0 ? void 0 : store.animationStartTime) ? store.animationStartTime : moment.utc().subtract(6, 'h').format(dateFormat);
+  return (store === null || store === void 0 ? void 0 : store.animationStartTime) ? store.animationStartTime : dateUtils.dateToString(dateUtils.sub(dateUtils.utc(), {
+    hours: 6
+  }), dateFormat);
 }, selectorMemoizationOptions);
 /**
  * Gets end time of animation
@@ -4172,7 +4180,9 @@ var getAnimationStartTime = createSelector(getMapById, function (store) {
  * @returns {string} returnType: string
  */
 var getAnimationEndTime$1 = createSelector(getMapById, function (store) {
-  return (store === null || store === void 0 ? void 0 : store.animationEndTime) ? store.animationEndTime : moment.utc().subtract(10, 'm').format(dateFormat);
+  return (store === null || store === void 0 ? void 0 : store.animationEndTime) ? store.animationEndTime : dateUtils.dateToString(dateUtils.sub(dateUtils.utc(), {
+    minutes: 10
+  }), dateFormat);
 }, selectorMemoizationOptions);
 /**
  * Returns map is auto updating
@@ -4286,7 +4296,7 @@ var getMapTimeSliderWidth = createSelector(getMapById, function (store) {
  * @returns {number} returnType: number - center time as a unix timestamp
  */
 var getMapTimeSliderCenterTime = createSelector(getMapById, function (store) {
-  return store ? store.timeSliderCenterTime : moment().unix();
+  return store ? store.timeSliderCenterTime : dateUtils.unix(dateUtils.utc());
 }, selectorMemoizationOptions);
 /**
  * Returns the unfiltered selected time of time slider
@@ -5125,16 +5135,16 @@ var storeTestSettings = /*#__PURE__*/Object.freeze({
 var _marked$6 = /*#__PURE__*/_regeneratorRuntime().mark(updateAnimation),
   _marked2$4 = /*#__PURE__*/_regeneratorRuntime().mark(handleBaseLayersSaga),
   _marked3$2 = /*#__PURE__*/_regeneratorRuntime().mark(rootSaga$5);
-// Expects start, end time as moment object and interval in minutes
+// Expects start, end time as Date object and interval in minutes
 var generateTimeList = function generateTimeList(start, end, interval) {
   var timeList = [];
-  var unixStart = moment(start).utc().unix();
-  var unixEnd = moment(end).utc().unix();
+  var unixStart = dateUtils.unix(start);
+  var unixEnd = dateUtils.unix(end);
   var intervalSeconds = interval * 60;
   for (var j = unixStart; j <= unixEnd; j += intervalSeconds) {
     timeList.push({
       name: 'time',
-      value: moment.unix(j).toISOString()
+      value: dateUtils.fromUnix(j).toISOString()
     });
   }
   return timeList;
@@ -5142,14 +5152,24 @@ var generateTimeList = function generateTimeList(start, end, interval) {
 var getAnimationEndTime = function getAnimationEndTime(animationEndTime) {
   var calculateFromNow = animationEndTime.split(/[-+]/)[0] === 'NOW';
   var isAddingTime = animationEndTime.indexOf('+') !== -1;
-  var timeInMinutes = moment.duration(animationEndTime.split(/[-+]/)[1]).asMinutes();
-  var startingTime = calculateFromNow ? moment().utc() : moment().utc().startOf('day');
-  var newAnimationEndTime = isAddingTime ? moment(startingTime).add(timeInMinutes, 'minutes').toISOString() : moment(startingTime).subtract(timeInMinutes, 'minutes').toISOString();
+  var duration = animationEndTime.substring(animationEndTime.indexOf('PT') + 2);
+  var _duration$split = duration.split('H'),
+    _duration$split2 = _slicedToArray(_duration$split, 2),
+    hours = _duration$split2[0],
+    minutes = _duration$split2[1];
+  var timeInMinutes = parseInt(hours, 10) * 60 + parseInt(minutes, 10);
+  var startingTime = calculateFromNow ? dateUtils.utc() : dateUtils.startOfDay(dateUtils.utc());
+  var newAnimationEndTime = isAddingTime ? dateUtils.add(startingTime, {
+    minutes: timeInMinutes
+  }).toISOString() : dateUtils.sub(startingTime, {
+    minutes: timeInMinutes
+  }).toISOString();
   return newAnimationEndTime;
 };
 var isAnimationEndTimeValid = function isAnimationEndTimeValid(animationEndTime) {
   var hasValidPrefix = animationEndTime.split(/[-+]/)[0] === 'NOW' || animationEndTime.split(/[-+]/)[0] === 'TODAY';
-  var hasValidDate = moment.isDuration(moment.duration(animationEndTime.split(/[-+]/)[1]));
+  var durationString = animationEndTime.substring(animationEndTime.indexOf('PT') + 2);
+  var hasValidDate = /^(\d+H)?(\d+M)?$/.test(durationString);
   return hasValidPrefix && hasValidDate;
 };
 var validInitialAnimationStep = function validInitialAnimationStep(initialAnimationStep, draw) {
@@ -5177,9 +5197,9 @@ function startAnimationSaga(_ref) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           mapId = payload.mapId, start = payload.start, initialTime = payload.initialTime, end = payload.end, interval = payload.interval, timeList = payload.timeList;
-          roundedStart = roundWithTimeStep(Number(start && moment.utc(start).unix()), interval, 'ceil');
-          roundedEnd = roundWithTimeStep(Number(end && moment.utc(end).unix()), interval, 'floor');
-          animationList = timeList || generateTimeList(moment.utc(roundedStart * 1000), moment.utc(roundedEnd * 1000), interval);
+          roundedStart = roundWithTimeStep(Number(start && dateUtils.unix(dateUtils.utc(start))), interval, 'ceil');
+          roundedEnd = roundWithTimeStep(Number(end && dateUtils.unix(dateUtils.utc(end))), interval, 'floor');
+          animationList = timeList || generateTimeList(dateUtils.fromUnix(roundedStart), dateUtils.fromUnix(roundedEnd), interval);
           _context.next = 6;
           return animationList;
         case 6:
@@ -5248,16 +5268,16 @@ function updateAnimation(mapId, maxValue) {
         return select(getAnimationStartTime, mapId);
       case 2:
         animationStart = _context4.sent;
-        animationStartUnix = moment.utc(animationStart).unix();
+        animationStartUnix = dateUtils.unix(dateUtils.utc(animationStart));
         _context4.next = 6;
         return select(getAnimationEndTime$1, mapId);
       case 6:
         animationEnd = _context4.sent;
-        animationEndUnix = moment.utc(animationEnd).unix();
-        t = moment.utc(maxValue).unix();
+        animationEndUnix = dateUtils.unix(dateUtils.utc(animationEnd));
+        t = dateUtils.unix(dateUtils.utc(maxValue));
         deltaT = t - animationEndUnix;
-        start = moment.unix(animationStartUnix + deltaT).utc().format(dateFormat);
-        end = moment.unix(animationEndUnix + deltaT).utc().format(dateFormat);
+        start = dateUtils.dateToString(dateUtils.fromUnix(animationStartUnix + deltaT), dateFormat);
+        end = dateUtils.dateToString(dateUtils.fromUnix(animationEndUnix + deltaT), dateFormat);
         _context4.next = 14;
         return put(mapActions.setAnimationEndTime({
           mapId: mapId,
@@ -5705,8 +5725,9 @@ function setMapPresetSaga(_ref6) {
           _context8.next = 58;
           return put(mapActions.setAnimationStartTime({
             mapId: mapId,
-            animationStartTime: moment(animationEnd).subtract(5 * 60, 'minutes') // set to default of 5 hours
-            .toISOString()
+            animationStartTime: dateUtils.sub(dateUtils.utc(animationEnd), {
+              minutes: 5 * 60 // set to default of 5 hours
+            }).toISOString()
           }));
         case 58:
           if (!animationLength) {
@@ -5720,7 +5741,9 @@ function setMapPresetSaga(_ref6) {
           _context8.next = 64;
           return put(mapActions.setAnimationStartTime({
             mapId: mapId,
-            animationStartTime: moment(_animationEnd).subtract(animationLength, 'minutes').toISOString()
+            animationStartTime: dateUtils.sub(dateUtils.utc(_animationEnd), {
+              minutes: animationLength
+            }).toISOString()
           }));
         case 64:
           if (!(animationPayload && animationPayload.speed)) {
@@ -5749,7 +5772,7 @@ function setMapPresetSaga(_ref6) {
           _context8.next = 76;
           break;
         case 75:
-          _context8.t0 = moment.utc().format(dateFormat);
+          _context8.t0 = dateUtils.dateToString(dateUtils.utc(), dateFormat);
         case 76:
           _animationEnd2 = _context8.t0;
           if (!(shouldEndtimeOverride && animationLength)) {
@@ -5763,7 +5786,9 @@ function setMapPresetSaga(_ref6) {
           _context8.next = 84;
           break;
         case 83:
-          _context8.t1 = moment.utc().subtract(duration, 'minutes').format(dateFormat);
+          _context8.t1 = dateUtils.dateToString(dateUtils.sub(dateUtils.utc(_animationEnd2), {
+            minutes: duration
+          }), dateFormat);
         case 84:
           animationStart = _context8.t1;
           _context8.next = 87;
@@ -5838,7 +5863,9 @@ function setMapPresetSaga(_ref6) {
           _context8.next = 114;
           return put(mapActions.setAnimationEndTime({
             mapId: mapId,
-            animationEndTime: moment(_animationEnd3).add(5, 'minutes').toISOString()
+            animationEndTime: dateUtils.add(dateUtils.utc(_animationEnd3), {
+              minutes: 5
+            }).toISOString()
           }));
         case 114:
           _context8.next = 116;
@@ -5848,7 +5875,9 @@ function setMapPresetSaga(_ref6) {
           _context8.next = 119;
           return put(mapActions.setAnimationStartTime({
             mapId: mapId,
-            animationStartTime: moment(_animationStart).add(5, 'minutes').toISOString()
+            animationStartTime: dateUtils.add(dateUtils.utc(_animationStart), {
+              minutes: 5
+            }).toISOString()
           }));
         case 119:
           _context8.next = 105;

package/package.json

@@ -1,12 +1,30 @@
 {
   "name": "@opengeoweb/store",
-  "version": "9.5.0",
+  "version": "9.7.0",
   "description": "GeoWeb Store library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
+  "dependencies": {
+    "@opengeoweb/shared": "*",
+    "react-redux": "^8.1.3",
+    "@reduxjs/toolkit": "^1.9.7",
+    "@redux-eggs/core": "^2.2.0",
+    "@opengeoweb/webmap-react": "*",
+    "redux-saga": "^1.2.3",
+    "@opengeoweb/webmap": "*",
+    "immer": "^9.0.21",
+    "@redux-eggs/redux-toolkit": "^2.2.0",
+    "@redux-eggs/saga-extension": "^2.2.0",
+    "date-fns": "^3.3.0",
+    "lodash": "^4.17.21",
+    "@opengeoweb/theme": "*"
+  },
+  "peerDependencies": {
+    "react": "18"
+  },
   "module": "./index.esm.js",
   "type": "module",
   "main": "./index.esm.js"

package/src/store/mapStore/layers/selectors.d.ts

@@ -354,3 +354,11 @@ export declare const getUseLatestReferenceTime: ((state: any, layerId: any) => b
 }> & {
     clearCache: () => void;
 };
+/**
+ * Returns the timestep for this layerId in seconds, or undefined if it has no time dimension or timeinterval.
+ */
+export declare const getTimeStepForLayerId: ((state: any, layerId: any) => number | undefined) & import("reselect").OutputSelectorFields<(args_0: Dimension | undefined) => number | undefined, {
+    clearCache: () => void;
+}> & {
+    clearCache: () => void;
+};

package/src/store/mapStore/map/index.d.ts

@@ -3,7 +3,7 @@ import * as utils from './utils';
 export declare const mapUtils: {
     replaceLayerIdsToEnsureUniqueLayerIdsInStore: (layerIds: import("./replaceLayerIdsToEnsureUniqueLayerIdsInStore").LayersAndAutoLayerIds) => import("./replaceLayerIdsToEnsureUniqueLayerIdsInStore").LayersAndAutoLayerIds;
     moveArrayElements<T>(array: T[], oldIndex: number, newIndex: number): T[];
-    dateFormat: "YYYY-MM-DDTHH:mm:ss[Z]";
+    dateFormat: "yyyy-MM-dd'T'HH:mm:ss'Z";
     createMap: ({ id, isAnimating, animationStartTime, animationEndTime, isAutoUpdating, isEndTimeOverriding, bbox, srs, baseLayers, overLayers, mapLayers, featureLayers, dimensions, autoUpdateLayerId, autoTimeStepLayerId, timeSliderSpan, timeStep, animationDelay, timeSliderWidth, timeSliderCenterTime, timeSliderSecondsPerPx, isTimestepAuto, isTimeSpanAuto, isTimeSliderHoverOn, isTimeSliderVisible, displayMapPin, disableMapPin, shouldShowZoomControls, }: utils.CreateMapProps) => mapTypes.WebMap;
     checkValidLayersPayload: (layers: import("../types").Layer[], mapId: string) => boolean;
     getDraftMapById: (mapId: string, draft: mapTypes.WebMapState) => mapTypes.WebMap;
@@ -11,7 +11,6 @@ export declare const mapUtils: {
     findMapIdFromLayerId: (mapState?: mapTypes.WebMapState | undefined, layerId?: string | undefined) => string | null;
     produceDraftStateSetMapDimensionFromLayerChangeDimension: (draft: mapTypes.WebMapState, layerId: string, dimension: mapTypes.Dimension) => void;
     getTimeStepFromDataInterval: (timeInterval: import("dist/libs/webmap/src").TimeInterval) => number;
-    getActiveLayerTimeStep: (timeDimension: mapTypes.Dimension | undefined) => number | undefined;
     getSpeedFactor: (speedDelay: number) => mapTypes.SpeedFactorType;
     getAnimationDuration: (animationEndTime: string | undefined, animationStartTime: string | undefined) => number;
     getSpeedDelay: (speedFactor: mapTypes.SpeedFactorType) => number;

package/src/store/mapStore/map/sagas.d.ts

@@ -1,10 +1,9 @@
 import { SagaIterator } from 'redux-saga';
-import { Moment } from 'moment';
 import { AnimationStep } from '@opengeoweb/webmap';
 import { mapActions } from '.';
 import { layerActions } from '../layers';
 import { Layer } from '../layers/types';
-export declare const generateTimeList: (start: Moment, end: Moment, interval: number) => {
+export declare const generateTimeList: (start: Date, end: Date, interval: number) => {
     name: string;
     value: string;
 }[];

package/src/store/mapStore/map/utils.d.ts

@@ -3,7 +3,7 @@ import { Bbox, Dimension } from './types';
 import { Scale } from './enums';
 import type { WebMapState, WebMap, SpeedFactorType } from '../types';
 import type { Layer } from '../layers/types';
-export declare const dateFormat = "YYYY-MM-DDTHH:mm:ss[Z]";
+export declare const dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z";
 export interface CreateMapProps {
     id: string;
     isAnimating?: boolean;
@@ -68,7 +68,6 @@ export declare const produceDraftStateSetMapDimensionFromLayerChangeDimension: (
  */
 export declare function moveArrayElements<T>(array: T[], oldIndex: number, newIndex: number): T[];
 export declare const getTimeStepFromDataInterval: (timeInterval: TimeInterval) => number;
-export declare const getActiveLayerTimeStep: (timeDimension: Dimension | undefined) => number | undefined;
 export declare const getSpeedFactor: (speedDelay: number) => SpeedFactorType;
 export declare const getAnimationDuration: (animationEndTime: string | undefined, animationStartTime: string | undefined) => number;
 /**