@opengeoweb/webmap 8.4.1 → 9.0.0

package/index.esm.js

@@ -20055,28 +20055,26 @@ function prefetchImagesForAnimation(wmMap) {
   var maxImagesToPrefetch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : MAX_IMAGES_TO_PREFETCH_DEFAULT;
   var animationSteps = wmMap.animationList;
   var countAnimationSteps = animationSteps.length;
-  var timesToPrefetchInOrder = lodash.exports.range(0, countAnimationSteps).map(function (offset) {
+  var animationStepsInOrder = lodash.exports.range(0, countAnimationSteps).map(function (offset) {
     // start prefecthing images for the next animation step first
     // when reaching end of animation, start from the beginning
     var indexOfNextAnimationStep = (wmMap.currentAnimationStep + offset) % countAnimationSteps;
-    return animationSteps[indexOfNextAnimationStep].value;
+    return animationSteps[indexOfNextAnimationStep];
   });
-  var currentTime = animationSteps[wmMap.currentAnimationStep].value;
-  prefetchLayerImagesInOrder(wmMap, timesToPrefetchInOrder, maxImagesToPrefetch, currentTime);
+  prefetchLayerImagesInOrderWithUrls(animationStepsInOrder, maxImagesToPrefetch);
 }
-function prefetchLayerImagesInOrder(wmMap, timesToPrefetchInOrder, maxImagesToPrefetch, currentTime) {
-  var _iterator = _createForOfIteratorHelper(timesToPrefetchInOrder),
+function prefetchLayerImagesInOrderWithUrls(animationStepsInOrder, maxImagesToPrefetch) {
+  var _iterator = _createForOfIteratorHelper(animationStepsInOrder),
     _step;
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var timeToPrefetch = _step.value;
+      var animationStep = _step.value;
       // dont prefetch if already prefetching too many images
       var countImagesLoading = getMapImageStore.getNumImagesLoading();
       if (countImagesLoading > maxImagesToPrefetch - 1) {
         break;
       }
-      var layersImageUrls = getLayersImageUrlsForTime(wmMap, timeToPrefetch, currentTime);
-      prefetchLayerImagesForTime(layersImageUrls);
+      prefetchLayerImagesForTime(animationStep.requests || []);
     }
   } catch (err) {
     _iterator.e(err);
@@ -20084,6 +20082,26 @@ function prefetchLayerImagesInOrder(wmMap, timesToPrefetchInOrder, maxImagesToPr
     _iterator.f();
   }
 }
+function prefetchLayerImagesInOrder(wmMap, timesToPrefetchInOrder, maxImagesToPrefetch, currentTime) {
+  var _iterator2 = _createForOfIteratorHelper(timesToPrefetchInOrder),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var timeToPrefetch = _step2.value;
+      // dont prefetch if already prefetching too many images
+      var countImagesLoading = getMapImageStore.getNumImagesLoading();
+      if (countImagesLoading > maxImagesToPrefetch - 1) {
+        break;
+      }
+      var layersImageUrls = getLayersImageUrlsForTime(wmMap, timeToPrefetch, currentTime);
+      prefetchLayerImagesForTime(layersImageUrls);
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+}
 function getLayersImageUrlsForTime(wmMap, timeToPrefetch, currentTime) {
   // get urls for layers at time
   wmMap.setTimeDimension(timeToPrefetch, false);
@@ -26851,6 +26869,26 @@ function init(){
 }
 */
 
+/**
+ * Re-formats moment's isoString to the string that is expected by WMJSDimension (for time).
+ * @param dateIn The input date to re-format, usually in the format `YYYY-MM-DDThh:mm:ss.uuuZ`
+ * @returns The formated input date in the format `YYYY-MM-DDThh:mm:ssZ`
+ */
+var handleMomentISOString = function handleMomentISOString(dateIn) {
+  /* Try to fix the timestrings generated by moment js made with moment.toISOString() */
+  if (!dateIn) {
+    return null;
+  }
+  if (dateIn.length > 20) {
+    var fixedDate = dateIn.substring(0, 19);
+    return "".concat(fixedDate, "Z");
+  }
+  if (dateIn.length === 17) {
+    var _fixedDate = dateIn.substring(0, 16);
+    return "".concat(_fixedDate, ":00Z");
+  }
+  return dateIn;
+};
 /**
  * WMJSDimension Class
  * Keep all information for a single dimension, like time.
@@ -29101,14 +29139,14 @@ var WMJSMap = /*#__PURE__*/function () {
     }
   }, {
     key: "_drawAndLoad",
-    value: function _drawAndLoad(animationList) {
+    value: function _drawAndLoad(inputAnimationList) {
       var _this8 = this;
       if (this.width < 4 || this.height < 4) {
         this._drawReady();
         return;
       }
       this.callBack.triggerEvent('beforedraw');
-      if (this.isAnimating === false && animationList !== undefined && _typeof$1(animationList) === 'object' && animationList.length > 0) {
+      if (this.isAnimating === false && inputAnimationList !== undefined && _typeof$1(inputAnimationList) === 'object' && inputAnimationList.length > 0) {
         // Ensure the time dimension has been loaded for the map before starting animation
         var timeDim = this.getDimension('time');
         if (!timeDim) {
@@ -29120,7 +29158,7 @@ var WMJSMap = /*#__PURE__*/function () {
         this.currentAnimationStep = this.initialAnimationStep;
         this.animationList = [];
         this.mouseHoverAnimationBox = false;
-        animationList.forEach(function (animationStepWithoutRequests, j) {
+        inputAnimationList.forEach(function (animationStepWithoutRequests, j) {
           if (selectedTime && animationStepWithoutRequests.value === selectedTime) {
             _this8.currentAnimationStep = j;
           }
@@ -32834,6 +32872,36 @@ var styleListForRADNL25PCPCMLayer = [{
   legendURL: 'https://geoservices.knmi.nl/wms?DATASET=RADAR&SERVICE=WMS&&version=1.1.1&service=WMS&request=GetLegendGraphic&layer=RAD_NL25_PCP_CM&format=image/png&STYLE=precip-with-range/nearest',
   "abstract": 'No abstract available'
 }];
+var multiDimensionLayer3 = {
+  service: 'https://testservicedimensions',
+  id: 'multiDimensionLayerMock2',
+  name: 'netcdf_5dims',
+  layerType: LayerType.mapLayer,
+  dimensions: [{
+    name: 'member',
+    units: 'member number',
+    currentValue: 'member1',
+    values: 'member1,member2,member3,member4'
+  }, {
+    name: 'elevation',
+    units: 'meters',
+    currentValue: '9000',
+    values: '1000,5000,9000'
+  }, {
+    name: 'time',
+    units: 'ISO8601',
+    currentValue: '2017-01-01T00:25:00Z',
+    timeInterval: {
+      year: 0,
+      month: 0,
+      day: 0,
+      hour: 0,
+      minute: 5,
+      second: 0,
+      isRegularInterval: true
+    }
+  }]
+};
 
 var testSettings = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -32846,7 +32914,8 @@ var testSettings = /*#__PURE__*/Object.freeze({
   layerWithoutTimeDimension: layerWithoutTimeDimension,
   WmLayerWithoutTimeDimension: WmLayerWithoutTimeDimension,
   crsListForRADNL25PCPCMLayer: crsListForRADNL25PCPCMLayer,
-  styleListForRADNL25PCPCMLayer: styleListForRADNL25PCPCMLayer
+  styleListForRADNL25PCPCMLayer: styleListForRADNL25PCPCMLayer,
+  multiDimensionLayer3: multiDimensionLayer3
 });
 
 /* *
@@ -33553,4 +33622,4 @@ var getCapabilities = /*#__PURE__*/Object.freeze({
   getLayersFlattenedFromService: getLayersFlattenedFromService
 });
 
-export { DateInterval, DebugType, EPSGCode, I18n, LayerType, ParseISOTimeRangeDuration, URLDecode, URLEncode, WMBBOX, WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMEmptyLayerName, WMEmptyLayerTitle, WMGetServiceFromStore, WMImage, WMImageEventType, WMJSDimension, WMJSMap, WMJSService, WMJScheckURL, WMLayer, WMTimer, clearImageCache, debugLogger, generateLayerId, generateMapId, generateTimesliderId, getCapabilities, getLegendGraphicURLForLayer, getMapImageStore, getWMJSDimensionForLayerAndDimension, getWMJSMapById, getWMJSTimeDimensionForLayerId, getWMLayerById, isDefined, legendImageStore, mockGetCapabilities, parseISO8601DateToDate, parseISO8601IntervalToDateInterval, registerWMJSMap, registerWMLayer, tilesettings, toArray, unRegisterAllWMJSLayersAndMaps, unRegisterWMJSLayer, unRegisterWMJSMap, testSettings as webmapTestSettings, utils as webmapUtils };
+export { DateInterval, DebugType, EPSGCode, I18n, LayerType, ParseISOTimeRangeDuration, URLDecode, URLEncode, WMBBOX, WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMEmptyLayerName, WMEmptyLayerTitle, WMGetServiceFromStore, WMImage, WMImageEventType, WMJSDimension, WMJSMap, WMJSService, WMJScheckURL, WMLayer, WMTimer, clearImageCache, debugLogger, generateLayerId, generateMapId, generateTimesliderId, getCapabilities, getLegendGraphicURLForLayer, getMapImageStore, getWMJSDimensionForLayerAndDimension, getWMJSMapById, getWMJSTimeDimensionForLayerId, getWMLayerById, handleMomentISOString, isDefined, legendImageStore, mockGetCapabilities, parseISO8601DateToDate, parseISO8601IntervalToDateInterval, registerWMJSMap, registerWMLayer, tilesettings, toArray, unRegisterAllWMJSLayersAndMaps, unRegisterWMJSLayer, unRegisterWMJSMap, testSettings as webmapTestSettings, utils as webmapUtils };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "8.4.1",
+  "version": "9.0.0",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -9,15 +9,5 @@
   },
   "module": "./index.esm.js",
   "type": "module",
-  "main": "./index.esm.js",
-  "dependencies": {},
-  "peerDependencies": {
-    "@opengeoweb/shared": "8.4.1",
-    "date-fns": "2.30.0",
-    "immer": "9.0.21",
-    "lodash": "4.17.21",
-    "moment": "2.29.4",
-    "proj4": "2.9.1",
-    "throttle-debounce": "5.0.0"
-  }
+  "main": "./index.esm.js"
 }

package/src/lib/components/WMJSDimension.d.ts

@@ -1,5 +1,11 @@
 import { Dimension, TimeInterval } from './types';
 import { CustomDate } from './WMTimeTypes';
+/**
+ * Re-formats moment's isoString to the string that is expected by WMJSDimension (for time).
+ * @param dateIn The input date to re-format, usually in the format `YYYY-MM-DDThh:mm:ss.uuuZ`
+ * @returns The formated input date in the format `YYYY-MM-DDThh:mm:ssZ`
+ */
+export declare const handleMomentISOString: (dateIn: string) => string;
 interface WMJSDimensionConfig {
     name?: string;
     units?: string;

package/src/lib/components/WMJSMap.d.ts

@@ -5,7 +5,7 @@ import { proj4 } from './WMJSExternalDependencies';
 import WMJSDimension from './WMJSDimension';
 import MapPin from './WMMapPin';
 import WMLayer from './WMLayer';
-import { AnimationList, LinkedInfo } from './types';
+import { AnimationStep, LinkedInfo } from './types';
 export declare const detectLeftButton: (evt: MouseEvent) => boolean;
 export declare const detectRightButton: (evt: MouseEvent) => boolean;
 export declare const getErrorsToDisplay: (canvasErrors: LinkedInfo[], getLayerByServiceAndName: (layerservice: string, layername: string) => WMLayer) => string[];
@@ -22,8 +22,8 @@ export default class WMJSMap {
     showLayerInfo: boolean;
     isAnimating: boolean;
     animationDelay: number;
-    animationList: AnimationList[] | string | undefined;
-    _animationList: AnimationList[] | string | undefined;
+    animationList: AnimationStep[] | string | undefined;
+    _animationList: AnimationStep[] | string | undefined;
     currentAnimationStep: number;
     initialAnimationStep: number;
     setAnimationDelay: (delay: number) => void;
@@ -183,13 +183,13 @@ export default class WMJSMap {
     displayScaleBarInMap(display: boolean): void;
     display(): void;
     _animFrameRedraw(): void;
-    draw(animationList?: AnimationList[] | string | undefined): void;
+    draw(animationList?: AnimationStep[] | string | undefined): void;
     /**
      * API Function called to draw the layers, fires getmap request and shows the layers on the screen
      */
-    _draw(animationList: AnimationList[] | string | undefined): void;
+    _draw(animationList: AnimationStep[] | string | undefined): void;
     _drawReady(): void;
-    _drawAndLoad(animationList: AnimationList[] | string | undefined): void;
+    _drawAndLoad(inputAnimationList: AnimationStep[] | string | undefined): void;
     _onLayersReadyCallbackFunction(): void;
     _onMapReadyCallbackFunction(): void;
     _onResumeSuspendCallbackFunction(): void;

package/src/lib/components/index.d.ts

@@ -9,11 +9,11 @@ import WMImage from './WMImage';
 import { getLegendGraphicURLForLayer, legendImageStore } from './WMLegend';
 import { getMapImageStore, WMImageEventType } from './WMImageStore';
 import { WMJSService } from './WMJSService';
-import WMJSDimension from './WMJSDimension';
+export { default as WMJSDimension, handleMomentISOString, } from './WMJSDimension';
 export { default as WMLayer, LayerType } from './WMLayer';
 export type { LayerOptions, LayerFoundation } from './WMLayer';
 export { default as WMBBOX } from './WMBBOX';
 export type { Bbox } from './WMBBOX';
-export { WMJSMap, DateInterval, parseISO8601IntervalToDateInterval, ParseISOTimeRangeDuration, isDefined, WMTimer, WMGetServiceFromStore, WMJScheckURL, URLEncode, URLDecode, WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMEmptyLayerName, WMEmptyLayerTitle, parseISO8601DateToDate, I18n, toArray, getLegendGraphicURLForLayer, legendImageStore, WMImage, debugLogger, DebugType, WMImageEventType, WMJSService, getMapImageStore, WMJSDimension, clearImageCache, };
+export { WMJSMap, DateInterval, parseISO8601IntervalToDateInterval, ParseISOTimeRangeDuration, isDefined, WMTimer, WMGetServiceFromStore, WMJScheckURL, URLEncode, URLDecode, WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMEmptyLayerName, WMEmptyLayerTitle, parseISO8601DateToDate, I18n, toArray, getLegendGraphicURLForLayer, legendImageStore, WMImage, debugLogger, DebugType, WMImageEventType, WMJSService, getMapImageStore, clearImageCache, };
 export * from './types';
 export * from './WMTimeTypes';

package/src/lib/components/types.d.ts

@@ -2,7 +2,7 @@ import type WMJSDimension from './WMJSDimension';
 import type WMLayer from './WMLayer';
 import { Bbox } from './WMBBOX';
 import type WMImage from './WMImage';
-export interface AnimationList {
+export interface AnimationStep {
     name: string;
     value: string;
     requests?: {

package/src/lib/utils/testSettings.d.ts

@@ -11,3 +11,4 @@ export declare const layerWithoutTimeDimension: LayerOptions;
 export declare const WmLayerWithoutTimeDimension: WMLayer;
 export declare const crsListForRADNL25PCPCMLayer: CoordinateReferenceSystem[];
 export declare const styleListForRADNL25PCPCMLayer: Style[];
+export declare const multiDimensionLayer3: LayerFoundation;