@opengeoweb/webmap 9.25.3 → 9.26.0

package/index.esm.js

@@ -1,5 +1,5 @@
 import { compact, range, isEqual } from 'lodash';
-import { dateUtils, defaultDelay as defaultDelay$1 } from '@opengeoweb/shared';
+import { PROJECTION, dateUtils, defaultDelay as defaultDelay$1 } from '@opengeoweb/shared';
 import { debounce, throttle } from 'throttle-debounce';
 import proj4 from 'proj4';
 
@@ -5150,28 +5150,13 @@ const WMSVersion = {
   version111: '1.1.1',
   version130: '1.3.0'
 };
-const WMProj4Defs = [['EPSG:4326', '+title=WGS 84 (long/lat) +proj=longlat +ellps=WGS84 +datum=WGS84 +units=degrees'], ['EPSG:4269', '+title=NAD83 (long/lat) +proj=longlat +a=6378137.0 +b=6356752.31414036 +ellps=GRS80 +datum=NAD83 +units=degrees'], ['EPSG:3575', '+proj=laea +lat_0=90 +lon_0=10 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'], ['EPSG:3785', '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs'], ['EPSG:3857', '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs'], ['EPSG:3411', '+proj=stere +lat_0=90 +lat_ts=70 +lon_0=-45 +k=1 +x_0=0 +y_0=0 +a=6378273 +b=6356889.449 +units=m +no_defs'], ['EPSG:3412', '+proj=stere +lat_0=-90 +lat_ts=-70 +lon_0=0 +k=1 +x_0=0 +y_0=0 +a=6378273 +b=6356889.449 +units=m +no_defs'], ['EPSG:28992', '+proj=sterea +lat_0=52.15616055555555 +lon_0=5.38763888888889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel +units=m +no_defs  <>'], ['EPSG:32661', '+proj=stere +lat_0=90 +lat_ts=90 +lon_0=0 +k=0.994 +x_0=2000000 +y_0=2000000 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'], ['EPSG:102100', '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs'], ['EPSG:3067', '+proj=utm +zone=35 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs +type=crs']];
-const epsgDescriptionLookup = {
-  'EPSG:3411': 'NSIDC Sea Ice Polar Stereographic North',
-  'EPSG:3412': 'NSIDC Sea Ice Polar Stereographic South',
-  'EPSG:3575': 'Lambert azimuthal equal-area projection Europe',
-  'EPSG:3785': 'Mercator (deprecated)',
-  'EPSG:3857': 'Mercator',
-  'EPSG:4258': 'ETRS89',
-  'EPSG:4326': 'World Lat lon WGS84',
-  'CRS:84': 'World Lat lon WGS84',
-  'EPSG:25831': 'ETRS89 / UTM zone 31N',
-  'EPSG:25832': 'ETRS89 / UTM zone 32N',
-  'EPSG:28992': 'Dutch Amersfoort / RD New',
-  'EPSG:32661': 'Polar Stereographic WGS 84 / UPS North',
-  'EPSG:3067': 'ETRS89 / TM35FIN(E,N) -- Finland'
-};
+const WMProj4Defs = [[PROJECTION.EPSG_4326.value, '+title=WGS 84 (long/lat) +proj=longlat +ellps=WGS84 +datum=WGS84 +units=degrees'], [PROJECTION.EPSG_4269.value, '+title=NAD83 (long/lat) +proj=longlat +a=6378137.0 +b=6356752.31414036 +ellps=GRS80 +datum=NAD83 +units=degrees'], [PROJECTION.EPSG_3575.value, '+proj=laea +lat_0=90 +lon_0=10 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'], [PROJECTION.EPSG_3785.value, '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs'], [PROJECTION.EPSG_3857.value, '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs'], [PROJECTION.EPSG_3411.value, '+proj=stere +lat_0=90 +lat_ts=70 +lon_0=-45 +k=1 +x_0=0 +y_0=0 +a=6378273 +b=6356889.449 +units=m +no_defs'], [PROJECTION.EPSG_3412.value, '+proj=stere +lat_0=-90 +lat_ts=-70 +lon_0=0 +k=1 +x_0=0 +y_0=0 +a=6378273 +b=6356889.449 +units=m +no_defs'], [PROJECTION.EPSG_28992.value, '+proj=sterea +lat_0=52.15616055555555 +lon_0=5.38763888888889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel +units=m +no_defs  <>'], [PROJECTION.EPSG_32661.value, '+proj=stere +lat_0=90 +lat_ts=90 +lon_0=0 +k=0.994 +x_0=2000000 +y_0=2000000 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'], [PROJECTION.EPSG_102100.value, '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs'], [PROJECTION.EPSG_3067.value, '+proj=utm +zone=35 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs +type=crs']];
 const mapImageStoreLength = 1000;
 const bgImageStoreLength = 360;
 const legendImageStoreLength = 500;
 const EVENT_GETCAPABILITIES_START = 'onstartgetcapabilities';
 const EVENT_GETCAPABILITIES_READY = 'onreadygetcapabilities';
-const WMJSMAP_LONLAT_EPSGCODE = 'EPSG:4326';
+const WMJSMAP_LONLAT_EPSGCODE = PROJECTION.EPSG_4326.value;
 
 /* debug helper */
 const enableConsoleDebugging = false;
@@ -5529,6 +5514,7 @@ const flattenLayerTree = layerTree => {
  * @returns
  */
 const makeNodeLayerFromWMSGetCapabilityLayer = (layer, path = [], isleaf = false, nestedLayerPath = []) => {
+  var _a, _b;
   const geographicBoundingBox = nestedLayerPath.reverse().reduce((p, c) => {
     return p || c.geographicBoundingBox;
   }, addBoundingBoxForLayer(layer));
@@ -5567,7 +5553,7 @@ const makeNodeLayerFromWMSGetCapabilityLayer = (layer, path = [], isleaf = false
     title: layerTitle || 'Layer',
     leaf: isleaf,
     path,
-    keywords: toArray(layer.KeywordList && layer.KeywordList.Keyword).map(keywords => keywords.value),
+    keywords: toArray((_b = (_a = layer.KeywordList) === null || _a === void 0 ? void 0 : _a.Keyword) !== null && _b !== void 0 ? _b : []).map(keyword => keyword.value).filter(Boolean),
     abstract: layer.Abstract ? layer.Abstract.value : undefined,
     styles,
     dimensions,
@@ -11728,7 +11714,7 @@ const getBBOXandProjString = (layer, projection) => {
   }
   if (layer.version === WMSVersion.version130) {
     request += `CRS=${URLEncode(srs)}&`;
-    if (srs === 'EPSG:4326' && layer.wms130bboxcompatibilitymode === false) {
+    if (srs === PROJECTION.EPSG_4326.value && layer.wms130bboxcompatibilitymode === false) {
       request += `BBOX=${bbox.bottom},${bbox.left},${bbox.top},${bbox.right}&`;
     } else {
       request += `BBOX=${bbox.left},${bbox.bottom},${bbox.right},${bbox.top}&`;
@@ -12531,7 +12517,7 @@ class WMTileRenderer {
           }
         }
       };
-      if (srs === 'EPSG:4326' || srs === 'EPSG:4258') {
+      if (srs === PROJECTION.EPSG_4326.value || srs === PROJECTION.EPSG_4258.value) {
         numTilesAtLevelX *= 2;
       }
       if (tilenbottom < 1) {
@@ -13325,23 +13311,6 @@ class MapPin {
   }
 }
 
-/* *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Copyright 2024 - Koninklijk Nederlands Meteorologisch Instituut (KNMI)
- * Copyright 2024 - Finnish Meteorological Institute (FMI)
- * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
- * */
 /* eslint-disable no-param-reassign */
 const drawTextBG = (ctx, txt, x, y, fontSize) => {
   ctx.textBaseline = 'top';
@@ -13451,31 +13420,31 @@ const drawScaleBar = (scaleBarProps, ctx) => {
     ctx.moveTo(offsetX + scaleBarProps.width * 2 + 1, scaleBarHeight - 2 + offsetY);
     ctx.lineTo(offsetX + scaleBarProps.width * 2 + 1, scaleBarHeight - 2 - 7 + offsetY);
     let units = '';
-    if (srs === 'EPSG:3411') {
+    if (srs === PROJECTION.EPSG_3411.value) {
       units = 'meter';
     }
-    if (srs === 'EPSG:3412') {
+    if (srs === PROJECTION.EPSG_3412.value) {
       units = 'meter';
     }
-    if (srs === 'EPSG:3575') {
+    if (srs === PROJECTION.EPSG_3575.value) {
       units = 'meter';
     }
-    if (srs === 'EPSG:4326') {
+    if (srs === PROJECTION.EPSG_4326.value) {
       units = 'degrees';
     }
-    if (srs === 'EPSG:28992') {
+    if (srs === PROJECTION.EPSG_28992.value) {
       units = 'meter';
     }
-    if (srs === 'EPSG:32661') {
+    if (srs === PROJECTION.EPSG_32661.value) {
       units = 'meter';
     }
-    if (srs === 'EPSG:3857') {
+    if (srs === PROJECTION.EPSG_3857.value) {
       units = 'meter';
     }
-    if (srs === 'EPSG:900913') {
+    if (srs === PROJECTION.EPSG_900913.value) {
       units = 'meter';
     }
-    if (srs === 'EPSG:102100') {
+    if (srs === PROJECTION.EPSG_102100.value) {
       units = 'meter';
     }
     if (units === 'meter') {
@@ -13762,7 +13731,7 @@ class WMJSMap {
         const xText = Math.round(this.mouseGeoCoordXY.x * roundingFactor) / roundingFactor;
         const yText = Math.round(this.mouseGeoCoordXY.y * roundingFactor) / roundingFactor;
         let units = '';
-        if (this._srs === 'EPSG:3857') {
+        if (this._srs === PROJECTION.EPSG_3857.value) {
           units = 'meter';
         }
         ctx.fillText(`CoordYX: (${yText}, ${xText}) ${units}`, 5, this._height - 50);
@@ -13892,7 +13861,7 @@ class WMJSMap {
     this._bbox.bottom = -90;
     this._bbox.right = 180;
     this._bbox.top = 90;
-    this._srs = 'EPSG:4326';
+    this._srs = PROJECTION.EPSG_4326.value;
     // IMAGE buffer
     this.canvasLayerBuffer = new WMCanvasBuffer(this, this._width, this._height, {
       beforecanvasstartdraw: this._adagucBeforeDraw,
@@ -13996,7 +13965,7 @@ class WMJSMap {
     }
     if (!projinfo.srs || !projinfo.bbox) {
       debugLogger(DebugType.Error);
-      projinfo.srs = 'EPSG:4326';
+      projinfo.srs = PROJECTION.EPSG_4326.value;
       projinfo.bbox.left = -180;
       projinfo.bbox.bottom = -90;
       projinfo.bbox.right = 180;
@@ -14986,14 +14955,14 @@ class WMJSMap {
    */
   setProjection(_srs, _bbox) {
     if (!_srs) {
-      _srs = 'EPSG:4326';
+      _srs = PROJECTION.EPSG_4326.value;
     }
     if (typeof _srs === 'object') {
       _bbox = new WMBBOX(_srs.bbox);
       _srs = _srs.srs;
     }
     if (!_srs) {
-      _srs = 'EPSG:4326';
+      _srs = PROJECTION.EPSG_4326.value;
     }
     if (this._srs !== _srs) {
       this._defaultBBOX.setBBOX(_bbox);
@@ -15682,7 +15651,7 @@ class WMJSMap {
 class WMProjection {
   constructor() {
     this.bbox = new WMBBOX();
-    this.srs = 'EPSG:4326';
+    this.srs = PROJECTION.EPSG_4326.value;
   }
 }
 
@@ -16144,7 +16113,7 @@ class WMLayer {
           const wmProjection = new WMProjection();
           wmProjection.srs = p.name || '';
           if (p.bbox) {
-            const swapBBOX = this.version === WMSVersion.version130 && wmProjection.srs === 'EPSG:4326' && this.wms130bboxcompatibilitymode === false;
+            const swapBBOX = this.version === WMSVersion.version130 && wmProjection.srs === PROJECTION.EPSG_4326.value && this.wms130bboxcompatibilitymode === false;
             if (swapBBOX) {
               wmProjection.bbox.setBBOX(p.bbox.bottom, p.bbox.left, p.bbox.top, p.bbox.right);
             } else {
@@ -17048,20 +17017,6 @@ var testSettings = /*#__PURE__*/Object.freeze({
  * Copyright 2020 - Finnish Meteorological Institute (FMI)
  * Copyright 2024 - The Norwegian Meteorological Institute (MET Norway)
  * */
-var EPSGCode;
-(function (EPSGCode) {
-  EPSGCode["EPSG3857"] = "EPSG:3857";
-  EPSGCode["EPSG28992"] = "EPSG:28992";
-  EPSGCode["TODO_EPSG4326"] = "TODO__EPSG:4326";
-  EPSGCode["EPSG3411"] = "EPSG:3411";
-  EPSGCode["EPSG32661"] = "EPSG:32661";
-  EPSGCode["EPSG54030"] = "EPSG:54030";
-  EPSGCode["EPSG4326"] = "EPSG:4326";
-  EPSGCode["EPSG4258"] = "EPSG:4258";
-  EPSGCode["EPSG3412"] = "EPSG:3412";
-  EPSGCode["EPSG3575"] = "EPSG:3575";
-  EPSGCode["EPSG3067"] = "EPSG:3067";
-})(EPSGCode || (EPSGCode = {}));
 const tilesettings = {
   WorldMap_Light_Grey_Canvas: {
     'EPSG:3857': {
@@ -17157,16 +17112,17 @@ const tilesettings = {
       tileServerType: 'osm',
       copyRight: 'Natural Earth II | Ingmapping'
     },
-    'TODO__EPSG:4326': {
-      home: 'https://geoweb-maps-assets.pmc.knmi.cloud/WorldMap/EPSG4326/',
-      minLevel: 0,
-      maxLevel: 9,
-      origX: -180,
-      origY: 90,
-      resolution: 1.422222,
-      tileServerType: 'osm',
-      copyRight: 'Natural Earth II | Ingmapping'
-    },
+    /* TODO
+     'EPSG:4326': {
+      home: 'https://geoweb-maps-assets.pmc.knmi.cloud/WorldMap/EPSG4326/',
+      minLevel: 0,
+      maxLevel: 9,
+      origX: -180,
+      origY: 90,
+      resolution: 1.422222,
+      tileServerType: 'osm',
+      copyRight: 'Natural Earth II | Ingmapping',
+    }, */
     'EPSG:3411': {
       home: 'https://geoweb-maps-assets.pmc.knmi.cloud/WorldMap/EPSG3411/',
       minLevel: 3,
@@ -17955,4 +17911,4 @@ var getCapabilities = /*#__PURE__*/Object.freeze({
 	recurseNodes: recurseNodes
 });
 
-export { DateInterval, DebugType, EPSGCode, EVENT_GETCAPABILITIES_READY, EVENT_GETCAPABILITIES_START, I18n, LayerType, ParseISOTimeRangeDuration, URLDecode, URLEncode, WMBBOX, WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMEmptyLayerName, WMEmptyLayerTitle, WMGetServiceFromStore, WMImage, WMImageEventType, WMJSDimension, WMJSMAP_LONLAT_EPSGCODE, WMJSMap, WMJSService, WMJScheckURL, WMLayer, WMListener, WMProj4Defs, WMProjection, WMSJSMAP_MINIMUM_MAP_HEIGHT, WMSJSMAP_MINIMUM_MAP_WIDTH, WMSVersion, bgImageStoreLength, buildMapLayerDims, buildWMSGetMapRequest, clearImageCacheForAllMaps, debugLogger, defaultReduxLayerRadarKNMI, detectLeftButton, detectRightButton, drawScaleBar, drawTextBG, epsgDescriptionLookup, generateLayerId, generateMapId, generateTimesliderId, getBBOXandProjString, getCapabilities, getErrorsToDisplay, getGeoCoordFromLatLong, getGeoCoordFromPixelCoord, getLatLongFromPixelCoord, getLayerIndex, getLegendGraphicURLForLayer, getPixelCoordFromGeoCoord, getPixelCoordFromLatLong, getScaleBarProperties, getSpeedDelay, getUriWithParam, getWMJSDimensionForLayerAndDimension, getWMJSMapById, getWMJSMapIds, getWMJSTimeDimensionForLayerId, getWMLayerById, getWMSGetFeatureInfoRequestURL, getWMSRequests, handleDateUtilsISOString, isDefined, isProjectionSupported, legendImageStore, legendImageStoreLength, mapConstants, mapImageStoreLength, mockGetCapabilities, multiDimensionLayer, parseISO8601DateToDate, parseISO8601IntervalToDateInterval, registerWMJSMap, registerWMLayer, roundWithTimeStep, speedFactors, tilesettings, toArray, unRegisterAllWMJSLayersAndMaps, unRegisterWMJSLayer, unRegisterWMJSMap, testSettings as webmapTestSettings, utils as webmapUtils, wmServiceListener };
+export { DateInterval, DebugType, EVENT_GETCAPABILITIES_READY, EVENT_GETCAPABILITIES_START, I18n, LayerType, ParseISOTimeRangeDuration, URLDecode, URLEncode, WMBBOX, WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMEmptyLayerName, WMEmptyLayerTitle, WMGetServiceFromStore, WMImage, WMImageEventType, WMJSDimension, WMJSMAP_LONLAT_EPSGCODE, WMJSMap, WMJSService, WMJScheckURL, WMLayer, WMListener, WMProj4Defs, WMProjection, WMSJSMAP_MINIMUM_MAP_HEIGHT, WMSJSMAP_MINIMUM_MAP_WIDTH, WMSVersion, bgImageStoreLength, buildMapLayerDims, buildWMSGetMapRequest, clearImageCacheForAllMaps, debugLogger, defaultReduxLayerRadarKNMI, detectLeftButton, detectRightButton, drawScaleBar, drawTextBG, generateLayerId, generateMapId, generateTimesliderId, getBBOXandProjString, getCapabilities, getErrorsToDisplay, getGeoCoordFromLatLong, getGeoCoordFromPixelCoord, getLatLongFromPixelCoord, getLayerIndex, getLegendGraphicURLForLayer, getPixelCoordFromGeoCoord, getPixelCoordFromLatLong, getScaleBarProperties, getSpeedDelay, getUriWithParam, getWMJSDimensionForLayerAndDimension, getWMJSMapById, getWMJSMapIds, getWMJSTimeDimensionForLayerId, getWMLayerById, getWMSGetFeatureInfoRequestURL, getWMSRequests, handleDateUtilsISOString, isDefined, isProjectionSupported, legendImageStore, legendImageStoreLength, mapConstants, mapImageStoreLength, mockGetCapabilities, multiDimensionLayer, parseISO8601DateToDate, parseISO8601IntervalToDateInterval, registerWMJSMap, registerWMLayer, roundWithTimeStep, speedFactors, tilesettings, toArray, unRegisterAllWMJSLayersAndMaps, unRegisterWMJSLayer, unRegisterWMJSMap, testSettings as webmapTestSettings, utils as webmapUtils, wmServiceListener };

package/package.json

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

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

@@ -11,24 +11,9 @@ export declare const WMSVersion: {
     version130: string;
 };
 export declare const WMProj4Defs: string[][];
-export declare const epsgDescriptionLookup: {
-    'EPSG:3411': string;
-    'EPSG:3412': string;
-    'EPSG:3575': string;
-    'EPSG:3785': string;
-    'EPSG:3857': string;
-    'EPSG:4258': string;
-    'EPSG:4326': string;
-    'CRS:84': string;
-    'EPSG:25831': string;
-    'EPSG:25832': string;
-    'EPSG:28992': string;
-    'EPSG:32661': string;
-    'EPSG:3067': string;
-};
 export declare const mapImageStoreLength = 1000;
 export declare const bgImageStoreLength = 360;
 export declare const legendImageStoreLength = 500;
 export declare const EVENT_GETCAPABILITIES_START = "onstartgetcapabilities";
 export declare const EVENT_GETCAPABILITIES_READY = "onreadygetcapabilities";
-export declare const WMJSMAP_LONLAT_EPSGCODE = "EPSG:4326";
+export declare const WMJSMAP_LONLAT_EPSGCODE: "EPSG:4326";

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

@@ -1,4 +1,5 @@
-import type { EPSGCode, TileServerMap, TileSettings } from '../utils';
+import { EPSGCode } from '@opengeoweb/shared';
+import type { TileServerMap, TileSettings } from '../utils';
 import WMBBOX from './WMBBOX';
 import WMImageStore from './WMImageStore';
 export default class WMTileRenderer {

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

@@ -1,3 +1,4 @@
+import { EPSGCode } from '@opengeoweb/shared';
 export interface TileSettings {
     home: string;
     minLevel: number;
@@ -12,21 +13,8 @@ export interface TileSettings {
     tileServerFormat?: string;
     tms?: boolean;
 }
-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",
-    EPSG3067 = "EPSG:3067"
-}
 export type TileSettingPerProjection = {
-    [code in EPSGCode]?: TileSettings;
+    [key in EPSGCode]?: TileSettings;
 };
 export interface Title {
     title?: string;