@opengeoweb/store 9.21.0 → 9.22.0

package/index.esm.js

@@ -1,4 +1,4 @@
-import { webmapUtils, LayerType, getWMJSMapById, WMLayer, webmapTestSettings, handleDateUtilsISOString, getCapabilities } from '@opengeoweb/webmap';
+import { webmapUtils, LayerType, getWMJSMapById, WMLayer, webmapTestSettings, getWMSRequests, isProjectionSupported, 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';
@@ -7632,6 +7632,8 @@ fixRegExpWellKnownSymbolLogic('split', function (SPLIT, nativeSplit, maybeCallNa
 
 /* A map with all the timerIds and their current step */
 const stepMap = new Map();
+/* A map with a list of timers and their dwell */
+const timerDwellMap = new Map();
 /**
  * Returns the next step for given timerId.
  * @param timerId The timer id
@@ -7645,6 +7647,30 @@ const getNextStep = (timerId, numberOfStepsInAnimation, numStepsToGoForward = 1)
   const nextStepClipped = (nextStep % numberOfStepsInAnimation + numberOfStepsInAnimation) % numberOfStepsInAnimation;
   return nextStepClipped;
 };
+/**
+ * Handles dwell at the end of the animation loop sequence. The number of steps to wait till proceed can be set by the dwell parameter.
+ * @param timerId The timer id
+ * @param numberOfStepsInAnimation Number of steps in the animation
+ * @param dwell The number of steps to wait at the end of the animation sequence before to continue
+ * @returns
+ */
+const handleTimerDwell = (timerId, numberOfStepsInAnimation, dwell = 8) => {
+  if (dwell > 0) {
+    const currentStep = getCurrentStep(timerId);
+    // Reset the dwell if we are not at the last animation step
+    if (currentStep < numberOfStepsInAnimation - 1) {
+      timerDwellMap.set(timerId, dwell);
+      return false;
+    }
+    // We are at the last animation step, check the dwell
+    const timerDwell = timerDwellMap.has(timerId) && timerDwellMap.get(timerId) || 0;
+    if (currentStep === numberOfStepsInAnimation - 1 && timerDwell > 0) {
+      timerDwellMap.set(timerId, timerDwell - 1);
+      return true;
+    }
+  }
+  return false;
+};
 /**
  * Set step for the timerId
  * @param timerId
@@ -7680,7 +7706,7 @@ const prefetchAnimationTargetsForMetronome = (timerId, animationListValues, targ
       const targetMapId = target.targetId;
       const wmMap = getWMJSMapById(targetMapId);
       if (wmMap) {
-        const layersImageUrls = wmMap.getWMSRequests([{
+        const layersImageUrls = getWMSRequests(wmMap, [{
           name: 'time',
           currentValue: nextTimeValueStepToCheck
         }]);
@@ -7999,8 +8025,8 @@ function* setMapPresetSaga({
       }));
       yield call$e(handleBaseLayersSaga, mapId, allBaseLayers);
       if (proj) {
-        const isProjectionSupported = webmapUtils.getWMJSMapById(mapId).isProjectionSupported(proj.srs);
-        if (!isProjectionSupported) {
+        const checkIsprojectionSupported = isProjectionSupported(proj.srs);
+        if (!checkIsprojectionSupported) {
           throw new Error(`Projection ${proj.srs} is not supported`);
         }
         //  set bbox
@@ -8232,7 +8258,7 @@ function* setStepBackwardOrForwardSaga({
   }
 }
 function* rootSaga$4() {
-  // resets WMJSMap state
+  // resets IWMJSMap state
   yield takeLatest(mapActions.mapStopAnimation.type, stopAnimationSaga);
   yield takeLatest(mapActions.mapStartAnimation.type, startAnimationSaga);
   yield takeLatest(layerActions.layerDelete.type, deleteLayerSaga);
@@ -8296,7 +8322,8 @@ const metronomeHandler = (timerIds, listenerApi) => {
         value: ''
       });
     }
-    const timerShouldStepForward = prefetchAnimationTargetsForMetronome(timerId, animationListValues, targets);
+    const timerIsInDwell = handleTimerDwell(timerId, animationListValues.length);
+    const timerShouldStepForward = prefetchAnimationTargetsForMetronome(timerId, animationListValues, targets) && !timerIsInDwell;
     // Determine the next step
     const timerStep = timerShouldStepForward ? getNextStep(timerId, animationListValues.length) : getCurrentStep(timerId);
     setStep(timerId, timerStep);

package/package.json

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

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

@@ -7,6 +7,14 @@ import { SetTimeSyncPayload } from '../../generic/synchronizationActions/types';
  * @returns
  */
 export declare const getNextStep: (timerId: string, numberOfStepsInAnimation: number, numStepsToGoForward?: number) => number;
+/**
+ * Handles dwell at the end of the animation loop sequence. The number of steps to wait till proceed can be set by the dwell parameter.
+ * @param timerId The timer id
+ * @param numberOfStepsInAnimation Number of steps in the animation
+ * @param dwell The number of steps to wait at the end of the animation sequence before to continue
+ * @returns
+ */
+export declare const handleTimerDwell: (timerId: string, numberOfStepsInAnimation: number, dwell?: number) => boolean;
 /**
  * Set step for the timerId
  * @param timerId