@opengeoweb/webmap 6.0.4 → 6.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "6.0.4",
+  "version": "6.1.0",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -12,7 +12,7 @@
   "main": "./index.esm.js",
   "dependencies": {},
   "peerDependencies": {
-    "@opengeoweb/shared": "6.0.4",
+    "@opengeoweb/shared": "6.1.0",
     "date-fns": "2.30.0",
     "lodash": "4.17.21",
     "moment": "2.29.4",

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

@@ -1,4 +1,5 @@
 import type WMJSMap from './WMJSMap';
+import { AnimationList } from './types';
 export default class WMJSAnimate {
     private _map;
     private _divAnimationInfo;
@@ -9,6 +10,10 @@ export default class WMJSAnimate {
     isCurrentAnimationTimeCloseToWallClockTime(): boolean;
     _animate(): void;
     _animateLoop(): void;
-    checkAnimation(): void;
+    prefetchImagesForAnimationSteps(): void;
     stopAnimating(): void;
+    getRequestsForAnimationStep(animationSteps: AnimationList[], index: number): {
+        url: string;
+        headers: Headers[];
+    }[];
 }

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

@@ -62,7 +62,7 @@ export declare const sortByImageDate: (imagesList: CanvasGeoLayer[]) => CanvasGe
  * @param bbox The boundingbox to search this image for
  * @returns A canvasLayer, containing the new image source with its geo properties
  */
-export declare const getAlternativeImage: (imageUrl: string, imageStore: WMImageStore, _bbox: CanvasBBOX) => CanvasGeoLayer;
+export declare const getAlternativeImage: (imageUrl: string, imageStore: WMImageStore, _bbox: CanvasBBOX) => CanvasGeoLayer | undefined;
 export default class WMCanvasBuffer {
     canvas: HTMLCanvasElement;
     _ctx: CanvasRenderingContext2D;

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

@@ -18,7 +18,7 @@ export default class WMImage {
     _isLoading: boolean;
     _hasError: boolean;
     srcToLoad: string;
-    loadEventCallback: (image: WMImage) => void;
+    loadEventCallback?: (image: WMImage) => void;
     el: HTMLImageElement;
     headers: Headers[];
     _imageTimeStampAtError: number;
@@ -35,6 +35,7 @@ export default class WMImage {
      * Returns true if the image has been loaded
      */
     isLoaded(): boolean;
+    isLoadedWithoutErrors(): boolean;
     /**
      * Returns true if the image is still loading
      */

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

@@ -1,4 +1,4 @@
-import { TimeInterval } from './types';
+import { Dimension, TimeInterval } from './types';
 import { CustomDate } from './WMTimeTypes';
 interface WMJSDimensionConfig {
     name?: string;
@@ -16,7 +16,7 @@ interface WMJSDimensionConfig {
  * Author : MaartenPlieger (plieger at knmi.nl)
  * Copyright KNMI
  */
-export default class WMJSDimension {
+export default class WMJSDimension implements Dimension {
     currentValue: string;
     defaultValue: string;
     name: string;

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

@@ -198,7 +198,7 @@ export default class WMJSMap {
         url: string;
         headers: Headers[];
     }[];
-    _pdraw(): void;
+    addLayersToCanvasAndDisplayThem(): void;
     _updateBoundingBox(_mapbbox: WMBBOX, triggerEvent?: boolean): void;
     redrawBuffer(): void;
     addBaseLayers(layer: WMLayer): void;
@@ -295,8 +295,8 @@ export default class WMJSMap {
         x: number;
         y: number;
     };
-    addListener(name: string, f: (param?: unknown) => void, keep?: boolean): boolean;
-    removeListener(name: string, f: (param?: unknown) => void): void;
+    addListener(name: string, f: (param?: any) => void, keep?: boolean): boolean;
+    removeListener(name: string, f: (param?: any) => void): void;
     getListener(): WMListener;
     suspendEvent(name: string): void;
     resumeEvent(name: string): void;

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

@@ -4,4 +4,4 @@ export declare const getBBOXandProjString: (map: WMJSMap, layer: WMLayer) => str
 export declare const buildWMSGetMapRequest: (map: WMJSMap, layer: WMLayer) => {
     url: string;
     headers: Headers[];
-};
+} | undefined;

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

@@ -45,7 +45,7 @@ export declare const getMapDimURL: (layer: WMLayer) => string;
  * @param params
  * @returns
  */
-export declare const getUriWithParam: (baseUrl: string, params: Record<string, any>) => string;
+export declare const getUriWithParam: (baseUrl: string, params?: Record<string, any>) => string;
 /**
  * Parses url and then it it allows for setting additional key value pairs in that URL (From https://stackoverflow.com/questions/5999118/how-can-i-add-or-update-a-query-string-parameter)
  * @param baseUrl

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

@@ -7,28 +7,34 @@ import { Style, Dimension, LayerProps, GeographicBoundingBox } from './types';
 export declare enum LayerType {
     mapLayer = "mapLayer",
     baseLayer = "baseLayer",
-    overLayer = "overLayer"
+    overLayer = "overLayer",
+    featureLayer = "featureLayer"
 }
-export interface LayerOptions {
-    id: string;
+export interface LayerFoundation {
+    dimensions?: Dimension[];
+    enabled?: boolean;
+    format?: string;
+    id?: string;
+    layerType?: LayerType;
     name?: string;
+    opacity?: number;
+    service?: string;
+    style?: string;
+    title?: string;
+    type?: string;
+}
+export interface LayerOptions extends LayerFoundation {
+    id: string;
     layerType: LayerType;
     service: string;
     active?: boolean;
-    format?: string;
     getgraphinfoURL?: string;
-    style?: string;
     currentStyle?: string;
     sldURL?: string;
-    opacity?: number;
-    title?: string;
-    enabled?: boolean;
     keepOnTop?: boolean;
     transparent?: boolean;
     onReady?: (param: this) => void;
-    type?: string;
     parentMap?: WMJSMap;
-    dimensions?: Dimension[];
     headers?: Headers[];
     failure?: (layer: WMLayer, message: string) => void;
     ReactWMJSLayerId?: string;

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

@@ -1,7 +1,8 @@
 import { CustomDate } from './WMTimeTypes';
+import { TimeInterval } from './types';
 /** ************************************************ */
 /** ************************************************ */
-export declare class DateInterval {
+export declare class DateInterval implements TimeInterval {
     year: number;
     month: number;
     day: number;

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

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

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

@@ -1,12 +1,11 @@
 import type WMJSDimension from './WMJSDimension';
 import type WMLayer from './WMLayer';
-import type { DateInterval } from './WMTime';
 import { Bbox } from './WMBBOX';
 import type WMImage from './WMImage';
 export interface AnimationList {
     name: string;
     value: string;
-    requests: {
+    requests?: {
         url: string;
         headers: Headers[];
     }[];
@@ -38,7 +37,7 @@ export type Dimension = {
     currentValue: string;
     maxValue?: string;
     minValue?: string;
-    timeInterval?: DateInterval;
+    timeInterval?: TimeInterval;
     synced?: boolean;
     values?: string;
     unitSymbol?: string;

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

@@ -1,4 +1,10 @@
-import { CoordinateReferenceSystem, LayerOptions, Style, WMLayer } from '../components';
+import { CoordinateReferenceSystem, Dimension, LayerFoundation, LayerOptions, Style, WMLayer } from '../components';
+export declare const multiDimensionLayer: LayerFoundation;
+export declare const WmdefaultReduxLayerRadarKNMI: WMLayer;
+export declare const defaultReduxLayerRadarKNMI: LayerFoundation & {
+    styles: Style[];
+};
+export declare const makeGeoservicesRadarLayer: (dimensions?: Dimension[]) => WMLayer;
 export declare const WmMultiDimensionLayer: WMLayer;
 export declare const layerWithoutTimeDimension: LayerOptions;
 export declare const WmLayerWithoutTimeDimension: WMLayer;

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

@@ -1,334 +1,37 @@
-export declare const tilesettings: {
-    WorldMap_Light_Grey_Canvas: {
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    OpenStreetMap_NL: {
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    OpenStreets_NL: {
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:28992': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    Positron_NL: {
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    Positron_NL_NoLabels: {
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    Klokantech_Basic_NL: {
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    Klokantech_Basic_NL_NoLabels: {
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    OSM_Blossom_NL: {
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    WorldMap: {
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'TODO__EPSG:4326': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:3411': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:28992': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:3412': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:32661': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:54030': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:3575': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    OSM_Antarctica: {
-        'EPSG:3412': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    arcGisCanvas: {
-        title: string;
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:28992': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    arcGisTopo: {
-        title: string;
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:28992': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    arcGisOceanBaseMap: {
-        'EPSG:3857': {
-            title: string;
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    arcGisSat: {
-        title: string;
-        'EPSG:4326': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileSize: number;
-            copyRight: string;
-        };
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    OpenStreetMap_Service: {
-        title: string;
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:28992': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
-    NaturalEarth2: {
-        'EPSG:3411': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:3412': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:3575': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:3857': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:4258': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:4326': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:28992': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:32661': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-        'EPSG:54030': {
-            home: string;
-            minLevel: number;
-            maxLevel: number;
-            origX: number;
-            origY: number;
-            resolution: number;
-            tileServerType: string;
-            copyRight: string;
-        };
-    };
+export interface TileSettings {
+    home: string;
+    minLevel: number;
+    maxLevel: number;
+    tileServerType: string;
+    copyRight: string;
+    origX?: number;
+    origY?: number;
+    resolution?: number;
+    title?: string;
+    tileSize?: number;
+}
+export declare enum EPSGCode {
+    EPSG3857 = "EPSG:3857",
+    EPSG28992 = "EPSG:28992",
+    TODO_EPSG4326 = "TODO__EPSG:4326",
+    EPSG3411 = "EPSG:3411",
+    EPSG32661 = "EPSG:32661",
+    EPSG54030 = "EPSG:54030",
+    EPSG4326 = "EPSG:4326",
+    EPSG4258 = "EPSG:4258",
+    EPSG3412 = "EPSG:3412",
+    EPSG3575 = "EPSG:3575"
+}
+type EPSGSettings = {
+    [code in EPSGCode]?: TileSettings;
 };
+export interface Title {
+    title?: string;
+}
+export interface MapType extends Title, EPSGSettings {
+}
+export interface TileServers {
+    [mapType: string]: MapType;
+}
+export declare const tilesettings: TileServers;
+export {};

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

@@ -1,4 +1,4 @@
-import { WMJSDimension, WMJSMap, WMLayer } from '../components';
+import type { WMJSDimension, WMJSMap, WMLayer } from '../components';
 export declare const generateLayerId: () => string;
 export declare const generateMapId: () => string;
 export declare const generateTimesliderId: () => string;