@opengeoweb/webmap 4.13.0 → 4.14.1

package/index.esm.js

@@ -2700,7 +2700,7 @@ var getTimeValues = function getTimeValues(isotime) {
 
 /** ************************************************* */
 
-var parseISO8601DateToDate = function parseISO8601DateToDate(_isotime) {
+var parseISO8601DateToDate = function parseISO8601DateToDate(unvalidatedIsotime) {
   /*
   The following functions are added to the standard Date object:
     - add(dateInterval) adds a DateInterval time to this time
@@ -2709,17 +2709,32 @@ var parseISO8601DateToDate = function parseISO8601DateToDate(_isotime) {
     - clone() creates a copy of this object
   */
 
-  /** TODO: Maarten Plieger, 2021-09-08
-   * https://gitlab.com/opengeoweb/opengeoweb/-/issues/1168
-   * This function now only works with strict iso strings in the form YYYY-MM-DDTHH:MM:SSZ.
-   * Some WMS's also provide it in different forms like  1981-01 and  2021-12. Make it work with this format too.
+  /** Timeformats according to:
+   * https://portal.ogc.org/files/?artifact_id=14416 / 06-042_OpenGIS_Web_Map_Service_WMS_Implementation_Specification.pdf,
+   * chapter D2.1 are supported
    */
-  if (!isValidISOTime(_isotime)) {
+  var makeISO8601StringFromFlexibleWMSDateString = function makeISO8601StringFromFlexibleWMSDateString(isoString) {
+    // Datestring starting with a - token are not supported.
+    if (!isoString || isoString.startsWith('-')) return isoString;
+    if (isoString.length === 4) return "".concat(isoString, "-01-01T00:00:00Z"); // YYYY
+
+    if (isoString.length === 7) return "".concat(isoString, "-01T00:00:00Z"); // YYYY-MM
+
+    if (isoString.length === 10) return "".concat(isoString, "T00:00:00Z"); // YYYY-MM-DD
+
+    if (isoString.length === 14) return "".concat(isoString.slice(0, -1), ":00:00Z"); // YYYY-MM-DDTHHZ
+
+    return isoString;
+  };
+
+  var isotime = makeISO8601StringFromFlexibleWMSDateString(unvalidatedIsotime);
+
+  if (!isValidISOTime(isotime)) {
     debug(DebugType.Warning);
     return undefined;
   }
 
-  var _getTimeValues = getTimeValues(_isotime),
+  var _getTimeValues = getTimeValues(isotime),
       _getTimeValues2 = _slicedToArray(_getTimeValues, 6),
       year = _getTimeValues2[0],
       month = _getTimeValues2[1],
@@ -5434,11 +5449,12 @@ var WMJSMap = /*#__PURE__*/function () {
         this.setProjection(projinfo.srs, projinfo.bbox);
       }
 
+      if (!this.baseDiv || !this.baseDiv.style) return;
       Object.assign(this.baseDiv.style, {
         width: this.width,
         height: this.height
       });
-      if (!this.mainElement.style) return;
+      if (!this.mainElement || !this.mainElement.style) return;
       this.mainElement.style.width = "".concat(this.width, "px");
       this.mainElement.style.height = "".concat(this.height, "px");
       this.setBBOX(this.resizeBBOX);

package/index.umd.js

@@ -2699,7 +2699,7 @@
 
   /** ************************************************* */
 
-  var parseISO8601DateToDate = function parseISO8601DateToDate(_isotime) {
+  var parseISO8601DateToDate = function parseISO8601DateToDate(unvalidatedIsotime) {
     /*
     The following functions are added to the standard Date object:
       - add(dateInterval) adds a DateInterval time to this time
@@ -2708,17 +2708,32 @@
       - clone() creates a copy of this object
     */
 
-    /** TODO: Maarten Plieger, 2021-09-08
-     * https://gitlab.com/opengeoweb/opengeoweb/-/issues/1168
-     * This function now only works with strict iso strings in the form YYYY-MM-DDTHH:MM:SSZ.
-     * Some WMS's also provide it in different forms like  1981-01 and  2021-12. Make it work with this format too.
+    /** Timeformats according to:
+     * https://portal.ogc.org/files/?artifact_id=14416 / 06-042_OpenGIS_Web_Map_Service_WMS_Implementation_Specification.pdf,
+     * chapter D2.1 are supported
      */
-    if (!isValidISOTime(_isotime)) {
+    var makeISO8601StringFromFlexibleWMSDateString = function makeISO8601StringFromFlexibleWMSDateString(isoString) {
+      // Datestring starting with a - token are not supported.
+      if (!isoString || isoString.startsWith('-')) return isoString;
+      if (isoString.length === 4) return isoString + "-01-01T00:00:00Z"; // YYYY
+
+      if (isoString.length === 7) return isoString + "-01T00:00:00Z"; // YYYY-MM
+
+      if (isoString.length === 10) return isoString + "T00:00:00Z"; // YYYY-MM-DD
+
+      if (isoString.length === 14) return isoString.slice(0, -1) + ":00:00Z"; // YYYY-MM-DDTHHZ
+
+      return isoString;
+    };
+
+    var isotime = makeISO8601StringFromFlexibleWMSDateString(unvalidatedIsotime);
+
+    if (!isValidISOTime(isotime)) {
       debug(exports.DebugType.Warning, 'No date given to parseISO8601DateToDate');
       return undefined;
     }
 
-    var _a = __read(getTimeValues(_isotime), 6),
+    var _a = __read(getTimeValues(isotime), 6),
         year = _a[0],
         month = _a[1],
         day = _a[2],
@@ -5426,11 +5441,12 @@
         this.setProjection(projinfo.srs, projinfo.bbox);
       }
 
+      if (!this.baseDiv || !this.baseDiv.style) return;
       Object.assign(this.baseDiv.style, {
         width: this.width,
         height: this.height
       });
-      if (!this.mainElement.style) return;
+      if (!this.mainElement || !this.mainElement.style) return;
       this.mainElement.style.width = this.width + "px";
       this.mainElement.style.height = this.height + "px";
       this.setBBOX(this.resizeBBOX);

package/lib/components/WMTime.d.ts

@@ -18,7 +18,7 @@ export declare const parseTimeValue: (value: string) => number;
 export declare const getTimeValues: (isotime: string) => number[];
 /** ************************************************* */
 /** ************************************************* */
-export declare const parseISO8601DateToDate: (_isotime: string) => CustomDate;
+export declare const parseISO8601DateToDate: (unvalidatedIsotime: string) => CustomDate;
 /** ****************************************************** */
 /** ****************************************************** */
 export declare const parseISO8601IntervalToDateInterval: (isotime: string) => DateInterval;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "4.13.0",
+  "version": "4.14.1",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {