@opengeoweb/webmap 4.18.0 → 4.19.0

package/index.esm.js

@@ -1,5 +1,6 @@
 import { debounce, throttle } from 'throttle-debounce';
 import { compact } from 'lodash';
+import { dateUtils } from '@opengeoweb/shared';
 import moment from 'moment';
 import proj4 from 'proj4';
 
@@ -2133,8 +2134,8 @@ var WMJSAnimate = /*#__PURE__*/function () {
   }
 
   _createClass(WMJSAnimate, [{
-    key: "_isCurrentAnimationTimeCloseToWallClockTime",
-    value: function _isCurrentAnimationTimeCloseToWallClockTime() {
+    key: "isCurrentAnimationTimeCloseToWallClockTime",
+    value: function isCurrentAnimationTimeCloseToWallClockTime() {
       if (this.isNextTimeCloseToWallClockTime) {
         this.isNextTimeCloseToWallClockTime = false;
         return true;
@@ -2142,13 +2143,13 @@ var WMJSAnimate = /*#__PURE__*/function () {
 
       var currentAnimationStep = this._map.animationList[this._map.currentAnimationStep];
       var nextAnimationStep = this._map.animationList[this._map.currentAnimationStep + 1 >= this._map.animationList.length ? 0 : this._map.currentAnimationStep + 1];
-      var wallClockTime = moment.utc();
-      var currentAnimationTime = moment.utc(currentAnimationStep.value);
-      var nextAnimationTime = moment.utc(nextAnimationStep.value);
+      var wallClockTime = new Date();
+      var currentAnimationTime = new Date(currentAnimationStep.value);
+      var nextAnimationTime = new Date(nextAnimationStep.value);
 
-      if (wallClockTime.isBetween(currentAnimationTime, nextAnimationTime, undefined, '[)')) {
-        var timeDiff1 = moment.duration(currentAnimationTime.clone().diff(wallClockTime)).asMinutes();
-        var timeDiff2 = moment.duration(nextAnimationTime.clone().diff(wallClockTime)).asMinutes();
+      if (dateUtils.isBetween(wallClockTime, currentAnimationTime, nextAnimationTime)) {
+        var timeDiff1 = dateUtils.differenceInMinutes(currentAnimationTime, wallClockTime);
+        var timeDiff2 = dateUtils.differenceInMinutes(nextAnimationTime, wallClockTime);
 
         if (Math.abs(timeDiff1) < Math.abs(timeDiff2)) {
           // Wall clock time is closer to current animation step time than to the next animation step time
@@ -2204,7 +2205,7 @@ var WMJSAnimate = /*#__PURE__*/function () {
         animationDelay *= 3;
       } else if (this._map.currentAnimationStep === this._map.animationList.length - 1) {
         animationDelay *= 5;
-      } else if (this._isCurrentAnimationTimeCloseToWallClockTime()) {
+      } else if (this.isCurrentAnimationTimeCloseToWallClockTime()) {
         animationDelay *= 5;
       }
 
@@ -3526,15 +3527,17 @@ var WMJSDimension = /*#__PURE__*/function () {
       /* 1. Get the last value in the list of the referencetime */
 
 
-      var lastRefTimeAsMoment = moment.utc(referenceTimeDim.getLastValue());
+      var lastRefTime = new Date(referenceTimeDim.getLastValue());
       /* 2. Get the original last value of the time dimension, we cannot use this.getLastValue(), as we are changing this. */
 
-      var timeLastValueAsMoment = moment.utc(this.values.split('/')[1]);
+      var orgLastDimTime = new Date(this.values.split('/')[1]);
       /* 3. Now calculate the run length */
 
-      var runLengthAsHour = moment.duration(timeLastValueAsMoment.clone().diff(lastRefTimeAsMoment)).asHours();
-      var newStartValueTimeAsMoment = moment.utc(referenceTimeValueToSet);
-      var newEndValueTimeAsMoment = newStartValueTimeAsMoment.clone().add(runLengthAsHour, 'h');
+      var runLengthAsHour = dateUtils.differenceInHours(orgLastDimTime, lastRefTime);
+      var newStartValueTime = new Date(referenceTimeValueToSet);
+      var newEndValueTime = dateUtils.add(new Date(newStartValueTime.getTime()), {
+        hours: runLengthAsHour
+      });
 
       if (this._type === 'timestartstopres') {
         /* Compose a new dataString interval and re-initialize the time dimension */
@@ -3542,14 +3545,14 @@ var WMJSDimension = /*#__PURE__*/function () {
           return value.trim();
         });
         var dateStringInterval = dateStringItems[2];
-        var newValue = "".concat(newStartValueTimeAsMoment.toISOString(), "/").concat(newEndValueTimeAsMoment.toISOString(), "/").concat(dateStringInterval);
-        this.defaultValue = newEndValueTimeAsMoment.toISOString();
+        var newValue = "".concat(newStartValueTime.toISOString(), "/").concat(newEndValueTime.toISOString(), "/").concat(dateStringInterval);
+        this.defaultValue = newEndValueTime.toISOString();
         this.reInitializeValues(newValue, true);
       } else if (this._type === 'timevalues') {
         /* Filter all dates from the array which are lower than given start value */
 
         /* TODO: Maarten Plieger 2020-06-10: Make this also work for WMS times advertised as a comma separated list */
-        var _newValue2 = parseISO8601DateToDate(newStartValueTimeAsMoment.toISOString());
+        var _newValue2 = parseISO8601DateToDate(newStartValueTime.toISOString());
 
         var newArray = this._allDates.filter(function (x) {
           return x >= _newValue2;

package/index.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('throttle-debounce'), require('lodash'), require('moment'), require('proj4')) :
-  typeof define === 'function' && define.amd ? define(['exports', 'throttle-debounce', 'lodash', 'moment', 'proj4'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Webmap = {}, global.throttleDebounce, global.lodash, global.moment, global.proj4));
-})(this, (function (exports, throttleDebounce, lodash, moment, proj4) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('throttle-debounce'), require('lodash'), require('@opengeoweb/shared'), require('moment'), require('proj4')) :
+  typeof define === 'function' && define.amd ? define(['exports', 'throttle-debounce', 'lodash', '@opengeoweb/shared', 'moment', 'proj4'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Webmap = {}, global.throttleDebounce, global.lodash, global.shared, global.moment, global.proj4));
+})(this, (function (exports, throttleDebounce, lodash, shared, moment, proj4) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -2108,7 +2108,7 @@
       _map.checkAnimation = this.checkAnimation;
     }
 
-    WMJSAnimate.prototype._isCurrentAnimationTimeCloseToWallClockTime = function () {
+    WMJSAnimate.prototype.isCurrentAnimationTimeCloseToWallClockTime = function () {
       if (this.isNextTimeCloseToWallClockTime) {
         this.isNextTimeCloseToWallClockTime = false;
         return true;
@@ -2116,13 +2116,13 @@
 
       var currentAnimationStep = this._map.animationList[this._map.currentAnimationStep];
       var nextAnimationStep = this._map.animationList[this._map.currentAnimationStep + 1 >= this._map.animationList.length ? 0 : this._map.currentAnimationStep + 1];
-      var wallClockTime = moment__default["default"].utc();
-      var currentAnimationTime = moment__default["default"].utc(currentAnimationStep.value);
-      var nextAnimationTime = moment__default["default"].utc(nextAnimationStep.value);
+      var wallClockTime = new Date();
+      var currentAnimationTime = new Date(currentAnimationStep.value);
+      var nextAnimationTime = new Date(nextAnimationStep.value);
 
-      if (wallClockTime.isBetween(currentAnimationTime, nextAnimationTime, undefined, '[)')) {
-        var timeDiff1 = moment__default["default"].duration(currentAnimationTime.clone().diff(wallClockTime)).asMinutes();
-        var timeDiff2 = moment__default["default"].duration(nextAnimationTime.clone().diff(wallClockTime)).asMinutes();
+      if (shared.dateUtils.isBetween(wallClockTime, currentAnimationTime, nextAnimationTime)) {
+        var timeDiff1 = shared.dateUtils.differenceInMinutes(currentAnimationTime, wallClockTime);
+        var timeDiff2 = shared.dateUtils.differenceInMinutes(nextAnimationTime, wallClockTime);
 
         if (Math.abs(timeDiff1) < Math.abs(timeDiff2)) {
           // Wall clock time is closer to current animation step time than to the next animation step time
@@ -2176,7 +2176,7 @@
         animationDelay *= 3;
       } else if (this._map.currentAnimationStep === this._map.animationList.length - 1) {
         animationDelay *= 5;
-      } else if (this._isCurrentAnimationTimeCloseToWallClockTime()) {
+      } else if (this.isCurrentAnimationTimeCloseToWallClockTime()) {
         animationDelay *= 5;
       }
 
@@ -3531,15 +3531,17 @@
       /* 1. Get the last value in the list of the referencetime */
 
 
-      var lastRefTimeAsMoment = moment__default["default"].utc(referenceTimeDim.getLastValue());
+      var lastRefTime = new Date(referenceTimeDim.getLastValue());
       /* 2. Get the original last value of the time dimension, we cannot use this.getLastValue(), as we are changing this. */
 
-      var timeLastValueAsMoment = moment__default["default"].utc(this.values.split('/')[1]);
+      var orgLastDimTime = new Date(this.values.split('/')[1]);
       /* 3. Now calculate the run length */
 
-      var runLengthAsHour = moment__default["default"].duration(timeLastValueAsMoment.clone().diff(lastRefTimeAsMoment)).asHours();
-      var newStartValueTimeAsMoment = moment__default["default"].utc(referenceTimeValueToSet);
-      var newEndValueTimeAsMoment = newStartValueTimeAsMoment.clone().add(runLengthAsHour, 'h');
+      var runLengthAsHour = shared.dateUtils.differenceInHours(orgLastDimTime, lastRefTime);
+      var newStartValueTime = new Date(referenceTimeValueToSet);
+      var newEndValueTime = shared.dateUtils.add(new Date(newStartValueTime.getTime()), {
+        hours: runLengthAsHour
+      });
 
       if (this._type === 'timestartstopres') {
         /* Compose a new dataString interval and re-initialize the time dimension */
@@ -3547,14 +3549,14 @@
           return value.trim();
         });
         var dateStringInterval = dateStringItems[2];
-        var newValue = newStartValueTimeAsMoment.toISOString() + "/" + newEndValueTimeAsMoment.toISOString() + "/" + dateStringInterval;
-        this.defaultValue = newEndValueTimeAsMoment.toISOString();
+        var newValue = newStartValueTime.toISOString() + "/" + newEndValueTime.toISOString() + "/" + dateStringInterval;
+        this.defaultValue = newEndValueTime.toISOString();
         this.reInitializeValues(newValue, true);
       } else if (this._type === 'timevalues') {
         /* Filter all dates from the array which are lower than given start value */
 
         /* TODO: Maarten Plieger 2020-06-10: Make this also work for WMS times advertised as a comma separated list */
-        var newValue_1 = parseISO8601DateToDate(newStartValueTimeAsMoment.toISOString());
+        var newValue_1 = parseISO8601DateToDate(newStartValueTime.toISOString());
 
         var newArray = this._allDates.filter(function (x) {
           return x >= newValue_1;

package/lib/components/WMAnimate.d.ts

@@ -6,7 +6,7 @@ export default class WMJSAnimate {
     private _imageStore;
     private isNextTimeCloseToWallClockTime;
     constructor(_map: WMJSMap);
-    _isCurrentAnimationTimeCloseToWallClockTime(): boolean;
+    isCurrentAnimationTimeCloseToWallClockTime(): boolean;
     _animate(): void;
     _animateLoop(): void;
     checkAnimation(): void;

package/lib/components/WMAnimate.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "4.18.0",
+  "version": "4.19.0",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -12,9 +12,20 @@
   "typings": "./index.d.ts",
   "dependencies": {},
   "peerDependencies": {
-    "moment": "^2.29.0",
+    "@opengeoweb/shared": "4.19.0",
+    "react": "^18.2.0",
+    "@mui/material": "^5.12.0",
+    "@opengeoweb/theme": "4.19.0",
+    "@mui/x-date-pickers": "^6.2.1",
+    "react-draggable": "^4.4.5",
+    "re-resizable": "^6.9.0",
+    "@redux-eggs/core": "^2.2.0",
+    "react-redux": "^8.0.4",
+    "lodash": "^4.17.20",
+    "axios": "^0.25.0",
+    "date-fns": "^2.29.3",
     "throttle-debounce": "^3.0.1",
-    "proj4": "^2.6.2",
-    "lodash": "^4.17.20"
+    "moment": "^2.29.0",
+    "proj4": "^2.6.2"
   }
 }