@opengeoweb/store 9.15.0 → 9.17.0

package/index.esm.js

@@ -1,4 +1,4 @@
-import { webmapUtils, LayerType, getWMJSMapById, WMLayer, webmapTestSettings, getAlternativeImage, handleDateUtilsISOString, getCapabilities } from '@opengeoweb/webmap';
+import { webmapUtils, LayerType, getWMJSMapById, WMLayer, webmapTestSettings, handleDateUtilsISOString, getCapabilities } from '@opengeoweb/webmap';
 import { createAction, createSlice, createSelector, createEntityAdapter, createListenerMiddleware } from '@reduxjs/toolkit';
 import { getGeoJson, moveFeature, createInterSections, getLastEmptyFeatureIndex, defaultLayers, emptyGeoJSON, addSelectionTypeToGeoJSON, getFeatureCollection, defaultIntersectionStyleProperties } from '@opengeoweb/webmap-react';
 export { defaultLayers } from '@opengeoweb/webmap-react';
@@ -2003,7 +2003,7 @@ var types$5 = /*#__PURE__*/Object.freeze({
 	get LayerActionOrigin () { return LayerActionOrigin; }
 });
 
-const dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z";
+const dateFormat = dateUtils.DATE_FORMAT_UTC;
 const createMap = ({
   id,
   isAnimating: _isAnimating = false,
@@ -2632,6 +2632,16 @@ const slice$7 = createSlice({
         draft.byId[layerId].geojson = geojson;
       }
     },
+    layerSetGeojsonFromLayer: (draft, action) => {
+      var _a;
+      const {
+        layerId,
+        sourceLayerId
+      } = action.payload;
+      if (draft.byId[layerId]) {
+        draft.byId[layerId].geojson = (_a = draft.byId[sourceLayerId]) === null || _a === void 0 ? void 0 : _a.geojson;
+      }
+    },
     layerDelete: (draft, action) => {
       const {
         layerId
@@ -5712,7 +5722,7 @@ const getAnimationStartTime = createSelector(getMapById, store => (store === nul
  * @param {string} mapId mapId: string - Id of the map
  * @returns {string} returnType: string
  */
-const getAnimationEndTime$1 = createSelector(getMapById, store => (store === null || store === void 0 ? void 0 : store.animationEndTime) ? store.animationEndTime : dateUtils.dateToString(dateUtils.sub(dateUtils.utc(), {
+const getAnimationEndTime = createSelector(getMapById, store => (store === null || store === void 0 ? void 0 : store.animationEndTime) ? store.animationEndTime : dateUtils.dateToString(dateUtils.sub(dateUtils.utc(), {
   minutes: 10
 }), dateFormat), selectorMemoizationOptions);
 /**
@@ -5990,7 +6000,7 @@ const getLegendId = createSelector(getMapById, store => store ? store.legendId :
  * @param {string} mapId mapId: string - Id of the map
  * @returns {MapPreset} returnType: MapPreset
  */
-const getMapPreset = createSelector(getMapLayers, getMapBaseLayers, getMapOverLayers, getBbox, getSrs, getActiveLayerId, getAutoTimeStepLayerId, getAutoUpdateLayerId, isAnimating, isAutoUpdating, isTimeSliderVisible, getDisplayMapPin, isZoomControlsVisible, getMapTimeStep, getMapAnimationDelay, getAnimationStartTime, getAnimationEndTime$1, isTimestepAuto, getLegendId, getUiStore, (mapLayers, baseLayers, overLayers, bbox, srs, activeLayerId, autoUpdateLayerId, autoTimeStepLayerId, isAnimating, isAutoUpdating, isTimeSliderVisible, displayMapPin, isZoomControlsVisible, mapTimeStep, mapAnimationDelay, animationStartTime, animationEndTime, isTimestepAuto, legendId, uiStore) => {
+const getMapPreset = createSelector(getMapLayers, getMapBaseLayers, getMapOverLayers, getBbox, getSrs, getActiveLayerId, getAutoTimeStepLayerId, getAutoUpdateLayerId, isAnimating, isAutoUpdating, isTimeSliderVisible, getDisplayMapPin, isZoomControlsVisible, getMapTimeStep, getMapAnimationDelay, getAnimationStartTime, getAnimationEndTime, isTimestepAuto, getLegendId, getUiStore, (mapLayers, baseLayers, overLayers, bbox, srs, activeLayerId, autoUpdateLayerId, autoTimeStepLayerId, isAnimating, isAutoUpdating, isTimeSliderVisible, displayMapPin, isZoomControlsVisible, mapTimeStep, mapAnimationDelay, animationStartTime, animationEndTime, isTimestepAuto, legendId, uiStore) => {
   var _a;
   const allLayers = [...baseLayers, ...overLayers, ...mapLayers].map(_a => {
     var layer = __rest(_a, ["mapId"]);
@@ -6070,7 +6080,7 @@ const getDockedLayerManagerSize = createSelector(getMapById, store => store ? st
  * @param {string} mapId mapId: string - Id of the map
  * @returns {animationList} returnType: WebMapAnimationList, list of timesteps to animate for this map.
  */
-const getAnimationList = createSelector(getMapById, getAnimationStartTime, getAnimationEndTime$1, getMapTimeStep, (mapStore, animationStart, animationEnd, animationInterval) => {
+const getAnimationList = createSelector(getMapById, getAnimationStartTime, getAnimationEndTime, getMapTimeStep, (mapStore, animationStart, animationEnd, animationInterval) => {
   // Animation is defined by one of the following:
   // - start, end and interval for a continuous animation loop with constant interval
   // - timeList, for a custom timeList
@@ -6119,7 +6129,7 @@ var selectors$2 = /*#__PURE__*/Object.freeze({
 	isAnimating: isAnimating,
 	linkedMapAnimationInfo: linkedMapAnimationInfo,
 	getAnimationStartTime: getAnimationStartTime,
-	getAnimationEndTime: getAnimationEndTime$1,
+	getAnimationEndTime: getAnimationEndTime,
 	isAutoUpdating: isAutoUpdating,
 	shouldEndtimeOverride: shouldEndtimeOverride,
 	getActiveLayerId: getActiveLayerId,
@@ -7655,14 +7665,18 @@ const prefetchAnimationTargetsForMetronome = (timerId, animationListValues, targ
               image.load();
             }
             if (numPrefetch === 0) {
-              const altImage = getAlternativeImage(layersImageUrl.url, wmMap.getMapImageStore, wmMap.getBBOX());
+              const altImage = wmMap.getAlternativeImage(layersImageUrl.url, wmMap.getBBOX(), true);
               // No alternative image available yet, so skipping animation.
-              if (!altImage) {
+              if (altImage.length === 0) {
                 // This is useful to indicate that the map is loading and has nothing yet to display.
                 // console.warn('No data available: Not stepping forward');
                 timerShouldStepForward = false;
               }
             }
+          } else if (image.isStale()) {
+            if (wmMap.getMapImageStore.getNumImagesLoading() < MAX_NUMBER_OF_PARALLEL_LOADING_IMAGES) {
+              image.forceReload(true);
+            }
           }
         }
       } else {
@@ -7673,25 +7687,6 @@ const prefetchAnimationTargetsForMetronome = (timerId, animationListValues, targ
   return timerShouldStepForward;
 };
 
-// Expects start, end time as Date object and interval in minutes
-const getAnimationEndTime = animationEndTime => {
-  const ISOtime = dateUtils.parseISO(animationEndTime);
-  if (dateUtils.isValid(ISOtime)) {
-    return ISOtime.toISOString();
-  }
-  const calculateFromNow = animationEndTime.split(/[-+]/)[0] === 'NOW';
-  const isAddingTime = animationEndTime.indexOf('+') !== -1;
-  const duration = animationEndTime.substring(animationEndTime.indexOf('PT') + 2);
-  const [hours, minutes] = duration.split('H');
-  const timeInMinutes = parseInt(hours, 10) * 60 + parseInt(minutes, 10);
-  const startingTime = calculateFromNow ? dateUtils.utc() : dateUtils.startOfDay(dateUtils.utc());
-  const newAnimationEndTime = isAddingTime ? dateUtils.add(startingTime, {
-    minutes: timeInMinutes
-  }).toISOString() : dateUtils.sub(startingTime, {
-    minutes: timeInMinutes
-  }).toISOString();
-  return newAnimationEndTime;
-};
 const isAnimationEndTimeValid = animationEndTime => {
   const hasValidPrefix = animationEndTime.split(/[-+]/)[0] === 'NOW' || animationEndTime.split(/[-+]/)[0] === 'TODAY';
   const durationString = animationEndTime.substring(animationEndTime.indexOf('PT') + 2);
@@ -7753,7 +7748,7 @@ function* updateAnimation(mapId, maxValue) {
   }
   const animationStart = yield select(getAnimationStartTime, mapId);
   // Calculate how much time the animation start need to move forwards
-  const animationEnd = yield select(getAnimationEndTime$1, mapId);
+  const animationEnd = yield select(getAnimationEndTime, mapId);
   const animationEndUnix = dateUtils.unix(dateUtils.utc(animationEnd));
   const maxTimeAsUnix = dateUtils.unix(dateUtils.utc(maxValue));
   const timeInSecondToShiftAnimationForwards = maxTimeAsUnix - animationEndUnix;
@@ -8037,28 +8032,43 @@ function* setMapPresetSaga({
       }
       // sets animationEndTime by endTime of animationPayload
       if (animationEndTime) {
+        const endTime = animationEndTime.includes('NOW') || animationEndTime.includes('TODAY') ? dateUtils.convertNOWandTODAYFormatsToUTC(animationEndTime) : animationEndTime;
         yield put(mapActions.setAnimationEndTime({
           mapId,
-          animationEndTime: getAnimationEndTime(animationEndTime)
+          animationEndTime: handleDateUtilsISOString(endTime)
+        }));
+        const startTime = handleDateUtilsISOString(dateUtils.sub(dateUtils.utc(endTime), {
+          minutes: 5 * 60 // set to default of 5 hours
+        }).toISOString());
+        yield put(mapActions.setAnimationStartTime({
+          mapId,
+          animationStartTime: startTime
+        }));
+        yield put(genericActions.setTime({
+          origin: '',
+          sourceId: mapId,
+          value: startTime
+        }));
+        const centerTimeInSeconds = new Date(handleDateUtilsISOString(endTime)).getTime();
+        yield put(mapActions.setTimeSliderCenterTime({
+          mapId,
+          timeSliderCenterTime: centerTimeInSeconds
         }));
-        if (!animationLength) {
-          const animationEnd = yield select(getAnimationEndTime$1, mapId);
-          yield put(mapActions.setAnimationStartTime({
-            mapId,
-            animationStartTime: dateUtils.sub(dateUtils.utc(animationEnd), {
-              minutes: 5 * 60 // set to default of 5 hours
-            }).toISOString()
-          }));
-        }
       }
       // sets animationStartTime by duration of animationPayload
       if (animationLength) {
-        const animationEnd = yield select(getAnimationEndTime$1, mapId);
+        const animationEnd = yield select(getAnimationEndTime, mapId);
+        const startTime = handleDateUtilsISOString(dateUtils.sub(dateUtils.utc(animationEnd), {
+          minutes: animationLength
+        }).toISOString());
         yield put(mapActions.setAnimationStartTime({
           mapId,
-          animationStartTime: dateUtils.sub(dateUtils.utc(animationEnd), {
-            minutes: animationLength
-          }).toISOString()
+          animationStartTime: startTime
+        }));
+        yield put(genericActions.setTime({
+          origin: '',
+          sourceId: mapId,
+          value: startTime
         }));
       }
       // sets animationDelay by speed of animationPayload
@@ -8071,7 +8081,7 @@ function* setMapPresetSaga({
       //  turn animation on
       if (shouldAnimate === true) {
         const duration = animationPayload && animationPayload.duration ? animationPayload.duration : 5 * 60; //  set to default of 5 hours
-        const animationEnd = shouldEndtimeOverride && animationEndTime ? yield select(getAnimationEndTime$1, mapId) : dateUtils.dateToString(dateUtils.utc(), dateFormat);
+        const animationEnd = shouldEndtimeOverride && animationEndTime ? yield select(getAnimationEndTime, mapId) : dateUtils.dateToString(dateUtils.utc(), dateFormat);
         const animationStart = shouldEndtimeOverride && animationLength ? yield select(getAnimationStartTime, mapId) : dateUtils.dateToString(dateUtils.sub(dateUtils.utc(animationEnd), {
           minutes: duration
         }), dateFormat);
@@ -8113,7 +8123,7 @@ function* setMapPresetSaga({
       while (animationEndTime && (shouldEndtimeOverride || !(shouldAutoUpdate || shouldAnimate))) {
         const fiveMinuteDelayForAnimation = 1000 * 60 * 5;
         yield delay(fiveMinuteDelayForAnimation);
-        const animationEnd = yield select(getAnimationEndTime$1, mapId);
+        const animationEnd = yield select(getAnimationEndTime, mapId);
         yield put(mapActions.setAnimationEndTime({
           mapId,
           animationEndTime: dateUtils.add(dateUtils.utc(animationEnd), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/store",
-  "version": "9.15.0",
+  "version": "9.17.0",
   "description": "GeoWeb Store library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {

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

@@ -60,6 +60,7 @@ export declare const mapStoreActions: {
     }, "layerReducer/layerChangeAcceptanceTime">;
     layerChangeName: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./types").SetLayerNamePayload, "layerReducer/layerChangeName">;
     layerChangeGeojson: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./types").SetLayerGeojsonPayload, "layerReducer/layerChangeGeojson">;
+    layerSetGeojsonFromLayer: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./types").SetLayerGeojsonFromLayerPayload, "layerReducer/layerSetGeojsonFromLayer">;
     layerDelete: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./types").DeleteLayerPayload, "layerReducer/layerDelete">;
     layerError: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./types").ErrorLayerPayload, "layerReducer/layerError">;
     baseLayerDelete: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("./types").DeleteLayerPayload, "layerReducer/baseLayerDelete">;

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

@@ -1,6 +1,6 @@
 import { Draft, PayloadAction } from '@reduxjs/toolkit';
 import { SetLayerDimensionsPayload, SetLayerStylePayload, UpdateLayerInfoPayload } from '@opengeoweb/webmap-react';
-import { LayerState, Layer, AddLayerPayload, SetLayerDimensionPayload, SetLayerEnabledPayload, SetLayerOpacityPayload, SetLayerNamePayload, SetLayerGeojsonPayload, DeleteLayerPayload, ErrorLayerPayload, SetLayersPayload, SetBaseLayersPayload, AddBaseLayerPayload, AddAvailableBaseLayerPayload, AddAvailableBaseLayersPayload, SetAvailableBaseLayersPayload, SetSelectedFeaturePayload, UpdateFeaturePayload, ExitFeatureDrawModePayload, ToggleFeatureModePayload, UpdateFeaturePropertiesPayload, DuplicateMapLayerPayload, ShowLayerInfoPayload } from './types';
+import { LayerState, Layer, AddLayerPayload, SetLayerDimensionPayload, SetLayerEnabledPayload, SetLayerOpacityPayload, SetLayerNamePayload, SetLayerGeojsonPayload, DeleteLayerPayload, ErrorLayerPayload, SetLayersPayload, SetBaseLayersPayload, AddBaseLayerPayload, AddAvailableBaseLayerPayload, AddAvailableBaseLayersPayload, SetAvailableBaseLayersPayload, SetSelectedFeaturePayload, UpdateFeaturePayload, ExitFeatureDrawModePayload, ToggleFeatureModePayload, UpdateFeaturePropertiesPayload, DuplicateMapLayerPayload, ShowLayerInfoPayload, SetLayerGeojsonFromLayerPayload } from './types';
 export declare const createLayer: ({ id, opacity, acceptanceTimeInMinutes, enabled, layerType, status, useLatestReferenceTime, ...props }: Layer) => Layer;
 export declare const initialState: LayerState;
 export declare const slice: import("@reduxjs/toolkit").Slice<LayerState, {
@@ -16,6 +16,7 @@ export declare const slice: import("@reduxjs/toolkit").Slice<LayerState, {
     }>) => void;
     layerChangeName: (draft: Draft<LayerState>, action: PayloadAction<SetLayerNamePayload>) => void;
     layerChangeGeojson: (draft: Draft<LayerState>, action: PayloadAction<SetLayerGeojsonPayload>) => void;
+    layerSetGeojsonFromLayer: (draft: Draft<LayerState>, action: PayloadAction<SetLayerGeojsonFromLayerPayload>) => void;
     layerDelete: (draft: Draft<LayerState>, action: PayloadAction<DeleteLayerPayload>) => void;
     layerError: (draft: Draft<LayerState>, action: PayloadAction<ErrorLayerPayload>) => void;
     baseLayerDelete: (draft: Draft<LayerState>, action: PayloadAction<DeleteLayerPayload>) => void;
@@ -56,6 +57,7 @@ export declare const layerActions: import("@reduxjs/toolkit").CaseReducerActions
     }>) => void;
     layerChangeName: (draft: Draft<LayerState>, action: PayloadAction<SetLayerNamePayload>) => void;
     layerChangeGeojson: (draft: Draft<LayerState>, action: PayloadAction<SetLayerGeojsonPayload>) => void;
+    layerSetGeojsonFromLayer: (draft: Draft<LayerState>, action: PayloadAction<SetLayerGeojsonFromLayerPayload>) => void;
     layerDelete: (draft: Draft<LayerState>, action: PayloadAction<DeleteLayerPayload>) => void;
     layerError: (draft: Draft<LayerState>, action: PayloadAction<ErrorLayerPayload>) => void;
     baseLayerDelete: (draft: Draft<LayerState>, action: PayloadAction<DeleteLayerPayload>) => void;

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

@@ -91,6 +91,9 @@ export interface SetLayerDimensionPayload extends LayerPayload {
 export interface SetLayerGeojsonPayload extends LayerPayload {
     geojson: FeatureCollection;
 }
+export interface SetLayerGeojsonFromLayerPayload extends LayerPayload {
+    sourceLayerId: string;
+}
 export interface DeleteLayerPayload extends LayerPayload {
     mapId: string;
     layerIndex?: number;

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-dd'T'HH:mm:ss'Z";
+    dateFormat: "yyyy-MM-dd'T'HH:mm:ss'Z'";
     createMap: ({ id, isAnimating, animationStartTime, animationEndTime, isAutoUpdating, shouldEndtimeOverride, 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;

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

@@ -3,7 +3,7 @@ import { SpeedFactorType } from '@opengeoweb/timeslider';
 import { Bbox, Dimension } from './types';
 import type { WebMapState, WebMap } from '../types';
 import type { Layer } from '../layers/types';
-export declare const dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z";
+export declare const dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'";
 export interface CreateMapProps {
     id: string;
     isAnimating?: boolean;

package/src/store/ui/types.d.ts

@@ -77,3 +77,6 @@ export interface UISetDialogFocusedPayload {
     type: DialogType;
     focused: boolean;
 }
+export interface UIToggleShowSentryRecordButton {
+    type: DialogType;
+}