@opengeoweb/webmap 4.1.0 → 4.2.0

package/index.esm.js

@@ -218,7 +218,6 @@ var debug = function debug(type, message) {
  * @param variable The variable to check
  * @returns true if variable is indeed defined, otherwise false.
  */
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types,@typescript-eslint/no-explicit-any
 
 var isDefined = function isDefined(variable) {
   if (variable === null) return false;
@@ -491,6 +490,43 @@ var addStylesForLayer = function addStylesForLayer(layerObjectFromWMS) {
     return style;
   });
 };
+var addDimensionsForLayer = function addDimensionsForLayer(layerObjectFromWMS) {
+  if (!layerObjectFromWMS.Dimension) return [];
+  var layerDimensions = toArray(layerObjectFromWMS.Dimension);
+  var list = layerDimensions.map(function (layerDimension) {
+    return {
+      name: layerDimension.attr.name,
+      units: layerDimension.attr.units,
+      currentValue: layerDimension.value
+    };
+  });
+  return list;
+};
+var addBoundingBoxForLayer = function addBoundingBoxForLayer(layerObjectFromWMS) {
+  var _a, _b, _c, _d;
+
+  if (layerObjectFromWMS.EX_GeographicBoundingBox) {
+    var layerBbox = layerObjectFromWMS.EX_GeographicBoundingBox;
+    return {
+      east: ((_a = layerBbox.eastBoundLongitude) === null || _a === void 0 ? void 0 : _a.value) || null,
+      west: ((_b = layerBbox.westBoundLongitude) === null || _b === void 0 ? void 0 : _b.value) || null,
+      north: ((_c = layerBbox.northBoundLatitude) === null || _c === void 0 ? void 0 : _c.value) || null,
+      south: ((_d = layerBbox.southBoundLatitude) === null || _d === void 0 ? void 0 : _d.value) || null
+    };
+  }
+
+  if (layerObjectFromWMS.LatLonBoundingBox) {
+    var _layerBbox = layerObjectFromWMS.LatLonBoundingBox;
+    return {
+      east: _layerBbox.attr.maxx || null,
+      west: _layerBbox.attr.minx || null,
+      north: _layerBbox.attr.maxy || null,
+      south: _layerBbox.attr.miny || null
+    };
+  }
+
+  return undefined;
+};
 
 /**
  * Returns the current time in ms
@@ -3002,7 +3038,7 @@ var WMJSDimension = /*#__PURE__*/function () {
 
       if (!referenceTimeValueToSet) {
         this.reInitializeValues(this.values);
-        this.setClosestValue(true);
+        this.setClosestValue(null);
         debug(DebugType.Warning);
         return;
       }
@@ -3829,7 +3865,6 @@ var WMFlyToBBox = function WMFlyToBBox(wmMap) {
 
   this.flyZoomToBBOXTimerStart = 1;
   this.flyZoomToBBOXTimerSteps = 5;
-  this.flyZoomToBBOXTimerLoop = undefined;
   this.flyZoomToBBOXDebounced = debounce;
   this.flyZoomToBBOXScaler = 0;
   this.flyZoomToBBOXCurrent = new WMBBOX();
@@ -7638,7 +7673,9 @@ rootNode, path) {
           return keywords.value;
         }),
         "abstract": layers[j].Abstract && layers[j].Abstract.value,
-        styles: addStylesForLayer(layers[j])
+        styles: addStylesForLayer(layers[j]),
+        dimensions: addDimensionsForLayer(layers[j]),
+        geographicBoundingBox: addBoundingBoxForLayer(layers[j])
       };
     } else {
       var nodeText = isNull(layers[j].Title) ? 'Layer' : layers[j].Title.value;
@@ -8810,10 +8847,12 @@ var WMLayer = /*#__PURE__*/function () {
           } else if (JSONLayers[k].Name) {
             if (JSONLayers[k].Name.value === thisLayer.name) {
               foundLayerFunction(JSONLayers[k], path, _nestedLayerPath);
-              return;
+              return undefined;
             }
           }
         }
+
+        return undefined;
       } // Try to recursively find the name in the getcap doc
 
 

package/index.umd.js

@@ -160,7 +160,6 @@
    * @param variable The variable to check
    * @returns true if variable is indeed defined, otherwise false.
    */
-  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types,@typescript-eslint/no-explicit-any
 
   var isDefined = function isDefined(variable) {
     if (variable === null) return false;
@@ -438,6 +437,43 @@
       return style;
     });
   };
+  var addDimensionsForLayer = function addDimensionsForLayer(layerObjectFromWMS) {
+    if (!layerObjectFromWMS.Dimension) return [];
+    var layerDimensions = toArray(layerObjectFromWMS.Dimension);
+    var list = layerDimensions.map(function (layerDimension) {
+      return {
+        name: layerDimension.attr.name,
+        units: layerDimension.attr.units,
+        currentValue: layerDimension.value
+      };
+    });
+    return list;
+  };
+  var addBoundingBoxForLayer = function addBoundingBoxForLayer(layerObjectFromWMS) {
+    var _a, _b, _c, _d;
+
+    if (layerObjectFromWMS.EX_GeographicBoundingBox) {
+      var layerBbox = layerObjectFromWMS.EX_GeographicBoundingBox;
+      return {
+        east: ((_a = layerBbox.eastBoundLongitude) === null || _a === void 0 ? void 0 : _a.value) || null,
+        west: ((_b = layerBbox.westBoundLongitude) === null || _b === void 0 ? void 0 : _b.value) || null,
+        north: ((_c = layerBbox.northBoundLatitude) === null || _c === void 0 ? void 0 : _c.value) || null,
+        south: ((_d = layerBbox.southBoundLatitude) === null || _d === void 0 ? void 0 : _d.value) || null
+      };
+    }
+
+    if (layerObjectFromWMS.LatLonBoundingBox) {
+      var layerBbox = layerObjectFromWMS.LatLonBoundingBox;
+      return {
+        east: layerBbox.attr.maxx || null,
+        west: layerBbox.attr.minx || null,
+        north: layerBbox.attr.maxy || null,
+        south: layerBbox.attr.miny || null
+      };
+    }
+
+    return undefined;
+  };
 
   /* *
    * Licensed under the Apache License, Version 2.0 (the "License");
@@ -3022,7 +3058,7 @@
 
       if (!referenceTimeValueToSet) {
         this.reInitializeValues(this.values);
-        this.setClosestValue(true);
+        this.setClosestValue(null);
         debug(exports.DebugType.Warning, 'returning');
         return;
       }
@@ -3882,7 +3918,6 @@
 
       this.flyZoomToBBOXTimerStart = 1;
       this.flyZoomToBBOXTimerSteps = 5;
-      this.flyZoomToBBOXTimerLoop = undefined;
       this.flyZoomToBBOXDebounced = throttleDebounce.debounce;
       this.flyZoomToBBOXScaler = 0;
       this.flyZoomToBBOXCurrent = new WMBBOX();
@@ -7603,7 +7638,9 @@
             return keywords.value;
           }),
           "abstract": layers[j].Abstract && layers[j].Abstract.value,
-          styles: addStylesForLayer(layers[j])
+          styles: addStylesForLayer(layers[j]),
+          dimensions: addDimensionsForLayer(layers[j]),
+          geographicBoundingBox: addBoundingBoxForLayer(layers[j])
         };
       } else {
         var nodeText = isNull(layers[j].Title) ? 'Layer' : layers[j].Title.value;
@@ -8774,10 +8811,12 @@
           } else if (JSONLayers[k].Name) {
             if (JSONLayers[k].Name.value === thisLayer.name) {
               foundLayerFunction(JSONLayers[k], path, nestedLayerPath_1);
-              return;
+              return undefined;
             }
           }
         }
+
+        return undefined;
       } // Try to recursively find the name in the getcap doc
 
 

package/lib/components/WMFlyToBBox.d.ts

@@ -4,7 +4,7 @@ export default class WMFlyToBBox {
     private wmMap;
     private flyZoomToBBOXTimerStart;
     private flyZoomToBBOXTimerSteps;
-    private flyZoomToBBOXTimerLoop;
+    private flyZoomToBBOXTimerLoop?;
     private flyZoomToBBOXDebounced;
     private flyZoomToBBOXScaler;
     private flyZoomToBBOXCurrent;

package/lib/components/WMGlobals.d.ts

@@ -1,7 +1,8 @@
+import type { WMJSService } from './WMJSService';
 /**
  * Global service store for re-use of services
  */
-export declare const WMServiceStore: any[];
+export declare const WMServiceStore: WMJSService[];
 export declare const WMServiceStoreXML2JSONRequest: {
     proxy: string;
 };

package/lib/components/WMJSDimension.d.ts

@@ -35,10 +35,10 @@ export default class WMJSDimension {
     private dimMaxValue;
     private dimTimeInterval;
     constructor(config?: WMJSDimensionConfig);
-    generateAllValues(): number[];
+    generateAllValues(): number | string[];
     setTimeValuesForReferenceTime(referenceTimeValueToSet: string, referenceTimeDim: WMJSDimension): void;
     reInitializeValues(values: string, forceReferenceTimeValue?: boolean): void;
-    initialize(forceothervalues?: any, forceReferenceTimeValue?: boolean): void;
+    initialize(forceothervalues?: string | undefined, forceReferenceTimeValue?: boolean): void;
     /**
      * Returns the current value of this dimensions.
      * If a ISO8601 period is set, the getValue will return a timeRange using addTimeRangeDurationToValue instead of a single value
@@ -55,7 +55,7 @@ export default class WMJSDimension {
      * @returns
      */
     getValues(): string;
-    setClosestValue(newValue?: any, evenWhenOutsideRange?: boolean): void;
+    setClosestValue(newValue?: string | null, evenWhenOutsideRange?: boolean): void;
     addTimeRangeDurationToValue(value: string): string;
     setTimeRangeDuration(duration: string): void;
     getClosestValue(_newValue: string, evenWhenOutsideRange?: boolean): string;

package/lib/components/WMJSService.d.ts

@@ -1,4 +1,4 @@
-import { Style } from './types';
+import { Dimension, GeographicBoundingBox, Style } from './types';
 export interface GetCapabilitiesJson {
     WMS_Capabilities?: any;
     WMT_MS_Capabilities?: any;
@@ -26,6 +26,8 @@ interface NodeObject {
     keywords?: string[];
     abstract?: string;
     styles?: Style[];
+    dimensions?: Dimension[];
+    geographicBoundingBox?: GeographicBoundingBox;
 }
 export declare const sortByKey: (array: NodeObject[], key: string) => NodeObject[];
 export declare const recursivelyFindLayer: (layers: any[], rootNode: any[], path: string[]) => void;
@@ -64,7 +66,7 @@ export declare class WMJSService {
      * @param succescallback Function called upon succes, cannot be left blank
      * @param failcallback Function called upon failure, cannot be left blank
      */
-    getCapabilities(succescallback: (param: GetCapabilitiesJson) => void, failcallback: (param: unknown) => void, forceReload: boolean, options: unknown): void;
+    getCapabilities(succescallback: (param: GetCapabilitiesJson) => void, failcallback: (param: unknown) => void, forceReload: boolean, options: any): void;
     checkException(jsonData: GetCapabilitiesJson): string | undefined;
     /**
      * Calls succes with a hierarchical node structure

package/lib/components/WMJSTools.d.ts

@@ -1,4 +1,4 @@
-import type { Style, WMSLayerFromGetCapabilities } from './types';
+import type { Dimension, GeographicBoundingBox, Style, WMSLayerFromGetCapabilities } from './types';
 import type WMLayer from './WMLayer';
 export declare const enableConsoleDebugging = false;
 export declare enum DebugType {
@@ -12,7 +12,7 @@ export declare const debug: (type: DebugType, message: string, ...optionalParam:
  * @param variable The variable to check
  * @returns true if variable is indeed defined, otherwise false.
  */
-export declare const isDefined: (variable: any) => boolean;
+export declare const isDefined: <T>(variable?: T | undefined) => variable is T;
 /**
  * Checks if a variable is null or not
  * @param variable The variable to check
@@ -65,3 +65,5 @@ export declare const dateToISO8601: (date: Date) => string;
  * @returns Style[] Array of style objects.
  */
 export declare const addStylesForLayer: (layerObjectFromWMS: WMSLayerFromGetCapabilities) => Style[];
+export declare const addDimensionsForLayer: (layerObjectFromWMS: WMSLayerFromGetCapabilities) => Dimension[];
+export declare const addBoundingBoxForLayer: (layerObjectFromWMS: WMSLayerFromGetCapabilities) => GeographicBoundingBox | undefined;

package/lib/components/WMMapPin.d.ts

@@ -14,7 +14,7 @@ declare class MapPin {
     redrawMap: () => void;
     drawMarker(ctx: CanvasRenderingContext2D): void;
     repositionMapPin: (_bbox: WMBBOX) => void;
-    setMapPin: (_x: number, _y: number, _bbox?: WMBBOX) => void;
+    setMapPin: (_x: number, _y: number, _bbox?: WMBBOX | undefined) => void;
     positionMapPinByLatLon: (coord: {
         x: number;
         y: number;

package/lib/components/types.d.ts

@@ -28,6 +28,12 @@ export interface Style {
     legendURL: string;
     abstract: string;
 }
+export interface GeographicBoundingBox {
+    west: string;
+    east: string;
+    north: string;
+    south: string;
+}
 export declare type WMLayerType = {
     setDimension: (name: string, value: string, updateMapDimensions: boolean) => void;
     getDimension: (name: string) => WMJSDimension;
@@ -42,4 +48,18 @@ export interface WMSLayerFromGetCapabilities {
     Dimension: unknown;
     Style: unknown;
     Extent: unknown;
+    EX_GeographicBoundingBox?: {
+        northBoundLatitude: any;
+        southBoundLatitude: any;
+        westBoundLongitude: any;
+        eastBoundLongitude: any;
+    };
+    LatLonBoundingBox?: {
+        attr: {
+            maxy: any;
+            miny: any;
+            maxx: any;
+            minx: any;
+        };
+    };
 }

package/package.json

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