@opengeoweb/webmap 7.0.0 → 8.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "7.0.0",
+  "version": "8.1.0",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -12,8 +12,9 @@
   "main": "./index.esm.js",
   "dependencies": {},
   "peerDependencies": {
-    "@opengeoweb/shared": "7.0.0",
+    "@opengeoweb/shared": "8.1.0",
     "date-fns": "2.30.0",
+    "immer": "9.0.21",
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "proj4": "2.9.0",

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

@@ -1,6 +1,6 @@
 import type WMJSMap from './WMJSMap';
-import { AnimationList } from './types';
 export default class WMJSAnimate {
+    #private;
     private _map;
     private _divAnimationInfo;
     private _callBack;
@@ -8,12 +8,6 @@ export default class WMJSAnimate {
     private isNextTimeCloseToWallClockTime;
     constructor(_map: WMJSMap);
     isCurrentAnimationTimeCloseToWallClockTime(): boolean;
-    _animate(): void;
-    _animateLoop(): void;
-    prefetchImagesForAnimationSteps(): void;
+    loopAnimation(): void;
     stopAnimating(): void;
-    getRequestsForAnimationStep(animationSteps: AnimationList[], index: number): {
-        url: string;
-        headers: Headers[];
-    }[];
 }

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

@@ -36,6 +36,7 @@ export default class WMImage {
      */
     isLoaded(): boolean;
     isLoadedWithoutErrors(): boolean;
+    hasNotStartedLoading(): boolean;
     /**
      * Returns true if the image is still loading
      */

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

@@ -17,6 +17,7 @@ export declare const clearImageCache: () => void;
 export default class WMJSMap {
     mapPin: MapPin;
     mapdimensions: WMJSDimension[];
+    timestepInMinutes: number | undefined;
     stopAnimating: () => void;
     showLayerInfo: boolean;
     isAnimating: boolean;
@@ -26,8 +27,6 @@ export default class WMJSMap {
     currentAnimationStep: number;
     initialAnimationStep: number;
     setAnimationDelay: (delay: number) => void;
-    isAnimatingLoopRunning: boolean;
-    checkAnimation: () => void;
     animateBusy: boolean;
     animationTimer: WMTimer;
     mouseHoverAnimationBox: boolean;
@@ -48,18 +47,18 @@ export default class WMJSMap {
     private layers;
     private baseLayers;
     private numBaseLayers;
-    private _map;
-    private renderer;
-    private layersBusy;
-    private mapBusy;
-    private hasGeneratedId;
+    private _map?;
+    private renderer?;
+    private layersBusy?;
+    private mapBusy?;
+    private hasGeneratedId?;
     private divZoomBox;
     private divBoundingBox;
     private divDimInfo;
     private _displayLegendInMap;
     private bbox;
     updateBBOX: WMBBOX;
-    private loadedBBOX;
+    private loadedBBOX?;
     drawnBBOX: WMBBOX;
     private divBuffer;
     private mapHeader;
@@ -90,7 +89,7 @@ export default class WMJSMap {
     private _resizeTimer;
     private wmAnimate;
     private wmTileRenderer;
-    private loadingDivTimer;
+    private loadingDivTimer?;
     private mouseWheelBusy;
     private wMFlyToBBox;
     private mouseWheelEventBBOXCurrent;
@@ -114,7 +113,7 @@ export default class WMJSMap {
     private previousMouseButtonState;
     private longlat;
     private tileRenderSettings;
-    private drawPending;
+    private drawPending?;
     private needsRedraw;
     private buildLayerDimsBusy;
     constructor(_element: HTMLElement);
@@ -302,6 +301,7 @@ export default class WMJSMap {
     resumeEvent(name: string): void;
     getDimensionList(): WMJSDimension[];
     getDimension(name: string): WMJSDimension;
+    setTimeDimension(value: string, triggerEvent: boolean): void;
     setDimension(name: string, value: string, triggerEvent?: boolean, adjustLayerDims?: boolean): void;
     zoomToLayer(_layer: WMLayer): void;
     setBBOX(left: number | WMBBOX, bottom?: number, right?: number, top?: number): boolean;

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

@@ -1,5 +1,5 @@
 import type WMJSMap from './WMJSMap';
-import WMLayer from './WMLayer';
+import type WMLayer from './WMLayer';
 export declare const getBBOXandProjString: (map: WMJSMap, layer: WMLayer) => string;
 export declare const buildWMSGetMapRequest: (map: WMJSMap, layer: WMLayer) => {
     url: string;

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

@@ -8,12 +8,12 @@ export interface Capability {
     Layer: WMSLayerFromGetCapabilities;
     Request: any;
 }
-export declare const loadGetCapabilitiesViaProxy: (url: string, succes: (param: string) => void, fail: (param: string) => void, xml2jsonrequestURL: string) => void;
+export declare const loadGetCapabilitiesViaProxy: (url: string, succes: (jsonData: GetCapabilitiesJson) => void, fail: (param: string) => void, xml2jsonrequestURL: string) => void;
 export declare const getWMSUrl: (service?: string, additionalParams?: {}) => string;
 /**
  * Global getcapabilities function
  */
-export declare const WMJSGetCapabilities: (service: string, succes: (param: unknown) => void, fail: (param: string) => void, options: {
+export declare const WMJSGetCapabilities: (service: string, succes: (jsonData: GetCapabilitiesJson) => void, fail: (param: string) => void, options: {
     headers?: {
         name: string;
         value: string;
@@ -53,7 +53,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: any): void;
+    getCapabilities(succescallback: (jsonData: GetCapabilitiesJson) => void, failcallback: (jsonData: string) => void, forceReload: boolean, options: any): void;
     checkException(jsonData: GetCapabilitiesJson): string | undefined;
     /**
      * Calls succes with a hierarchical node structure

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

@@ -6,7 +6,7 @@ export declare enum DebugType {
     Warning = 1,
     Error = 2
 }
-export declare const debug: (type: DebugType, message: string, ...optionalParam: unknown[]) => void;
+export declare const debugLogger: (type: DebugType, message: string, ...optionalParam: unknown[]) => void;
 /**
  * Checks if variable is defined or not
  * @param variable The variable to check

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

@@ -36,7 +36,7 @@ export interface LayerOptions extends LayerFoundation {
     sldURL?: string;
     keepOnTop?: boolean;
     transparent?: boolean;
-    onReady?: (param: this) => void;
+    onReady?: (param: LayerOptions) => void;
     parentMap?: WMJSMap;
     headers?: Headers[];
     failure?: (layer: WMLayer, message: string) => void;
@@ -106,7 +106,7 @@ export default class WMLayer {
     getgraphinfoURL: string;
     format: string;
     _options: LayerOptions;
-    onReady: (param: this) => void;
+    onReady: (param: LayerOptions) => void;
     optimalFormat: string;
     wmsextensions: {
         url: string;
@@ -162,7 +162,7 @@ export default class WMLayer {
      */
     getStyleObject(styleName: string, nextPrev: number): Style;
     getStyle(): string;
-    getDimension(name: string): WMJSDimension;
+    getDimension(name: string): WMJSDimension | undefined;
     /**
      * Returns the Coordinate Reference Systems for this layer
      * @returns List of WMProjection objects

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

@@ -0,0 +1,9 @@
+import type WMJSMap from './WMJSMap';
+export declare function prefetchImagesForAnimation(wmMap: WMJSMap, maxImagesToPrefetch?: number): void;
+type PrefetchRequest = {
+    url: string;
+    headers: Headers[];
+};
+export declare function getLayersImageUrlsForTime(wmMap: WMJSMap, timeToPrefetch: string, currentTime: string): PrefetchRequest[];
+export declare function prefetchImagesForNonAnimation(wmMap: WMJSMap, maxImagesToPrefetch?: number): void;
+export {};

package/src/lib/components/WMPrefetch.spec.d.ts

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

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

@@ -1,5 +1,5 @@
 import WMJSMap, { clearImageCache } from './WMJSMap';
-import { isDefined, WMJScheckURL, URLDecode, URLEncode, toArray, debug, DebugType } from './WMJSTools';
+import { isDefined, WMJScheckURL, URLDecode, URLEncode, toArray, debugLogger, DebugType } from './WMJSTools';
 import WMTimer from './WMTimer';
 import WMGetServiceFromStore from './WMGetServiceFromStore';
 import { WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMEmptyLayerName, WMEmptyLayerTitle } from './WMConstants';
@@ -14,6 +14,6 @@ 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, debug, 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, WMJSDimension, clearImageCache, };
 export * from './types';
 export * from './WMTimeTypes';

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

@@ -1,22 +1,6 @@
-import { CoordinateReferenceSystem, Dimension, LayerFoundation, LayerOptions, LayerType, Style, WMLayer } from '../components';
-export declare const defaultReduxLayerRadarColor: {
-    service: string;
-    name: string;
-    title: string;
-    format: string;
-    style: string;
-    enabled: boolean;
-    layerType: LayerType;
-    dimensions: never[];
-    styles: {
-        title: string;
-        name: string;
-        legendURL: string;
-        abstract: string;
-    }[];
-    id: string;
-};
-export declare const multiDimensionLayer: LayerFoundation;
+import { CoordinateReferenceSystem, Dimension, LayerFoundation, LayerOptions, Style, WMLayer } from '../components';
+export declare const defaultReduxLayerRadarColor: LayerOptions;
+export declare const multiDimensionLayer: LayerOptions;
 export declare const WmdefaultReduxLayerRadarKNMI: WMLayer;
 export declare const defaultReduxLayerRadarKNMI: LayerFoundation & {
     styles: Style[];

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

@@ -1,19 +1,5 @@
-import { LayerType } from '../components/WMLayer';
-export declare const defaultReduxLayerRadarKNMI: {
-    service: string;
-    name: string;
-    title: string;
-    format: string;
-    style: string;
-    enabled: boolean;
-    layerType: LayerType;
-    dimensions: {
-        name: string;
-        units: string;
-        currentValue: string;
-    }[];
-    id: string;
-};
+import { LayerOptions, LayerType } from '../components/WMLayer';
+export declare const defaultReduxLayerRadarKNMI: LayerOptions;
 export declare const multiDimensionLayer: {
     service: string;
     id: string;