@opengeoweb/webmap 9.0.0 → 9.2.0

package/index.esm.js

@@ -18965,6 +18965,15 @@ var sharedImagesList = {};
  * @returns A signature for this image, which is the same for images with different bbox and or width/height
  */
 var makeQueryStringWithoutGeoInfo = function makeQueryStringWithoutGeoInfo(imageSource) {
+  if (imageSource.indexOf('GFI%3ATIME_ELEVATION') !== -1) {
+    return getUriWithParam(imageSource, {
+      BBOX: '',
+      WIDTH: '',
+      HEIGHT: '',
+      time: '',
+      elevation: ''
+    });
+  }
   return getUriWithParam(imageSource, {
     BBOX: '',
     WIDTH: '',
@@ -27667,7 +27676,7 @@ var buildWMSGetMapRequest = function buildWMSGetMapRequest(map, layer) {
     var x = 707;
     var y = 557;
     var bbox = '29109.947643979103,6500000,1190890.052356021,7200000';
-    var _srs = 'EPSG:3857';
+    var _srs = 'GFI:TIME_ELEVATION';
     var _request = layer.getmapURL;
     _request += "&SERVICE=WMS&REQUEST=GetFeatureInfo&VERSION=".concat(layer.version);
     _request += "&LAYERS=".concat(URLEncode(layer.name));
@@ -27696,6 +27705,7 @@ var buildWMSGetMapRequest = function buildWMSGetMapRequest(map, layer) {
     _request += '&FORMAT=image/gif';
     _request += '&INFO_FORMAT=image/png';
     _request += '&STYLES=';
+    _request += '&TRANSPARENT=TRUE';
     var startDate = dateToISO8601(new Date(mapBbox.left));
     var stopDate = dateToISO8601(new Date(mapBbox.right));
     _request += "&time=".concat(startDate, "/").concat(stopDate);
@@ -27933,6 +27943,7 @@ var WMJSMap = /*#__PURE__*/function () {
     this.mapIsActivated = false;
     this.isMapHeaderEnabled = false;
     this.showScaleBarInMap = true;
+    this.showCursorCoordinates = true;
     this.mouseHoverAnimationBox = false;
     this.callBack = new WMListener();
     this.initialized = false;
@@ -28032,6 +28043,8 @@ var WMJSMap = /*#__PURE__*/function () {
     this._makeInfoHTML = this._makeInfoHTML.bind(this);
     this.showScaleBar = this.showScaleBar.bind(this);
     this.hideScaleBar = this.hideScaleBar.bind(this);
+    this.showMouseCursorProperties = this.showMouseCursorProperties.bind(this);
+    this.hideMouseCursorProperties = this.hideMouseCursorProperties.bind(this);
     this.display = this.display.bind(this);
     this.draw = this.draw.bind(this);
     this._draw = this._draw.bind(this);
@@ -28104,6 +28117,7 @@ var WMJSMap = /*#__PURE__*/function () {
     this.setDimension = this.setDimension.bind(this);
     this.zoomToLayer = this.zoomToLayer.bind(this);
     this.setBBOX = this.setBBOX.bind(this);
+    this.setDefaultBBOX = this.setDefaultBBOX.bind(this);
     this.zoomOut = this.zoomOut.bind(this);
     this.zoomIn = this.zoomIn.bind(this);
     this.displayLegendInMap = this.displayLegendInMap.bind(this);
@@ -28412,37 +28426,39 @@ var WMJSMap = /*#__PURE__*/function () {
           ctx.stroke();
         }
       }
-      // Mouse projected coords
-      ctx.font = '10px Helvetica';
-      ctx.textBaseline = 'middle';
-      ctx.textAlign = 'left';
-      if (isDefined(this.mouseGeoCoordXY)) {
-        var roundingFactor = 1.0 / Math.pow(10, parseInt(Math.log((this.bbox.right - this.bbox.left) / this.width) / Math.log(10), 10) - 2);
-        if (roundingFactor < 1) {
-          roundingFactor = 1;
-        }
-        ctx.fillStyle = '#000000';
-        var xText = Math.round(this.mouseGeoCoordXY.x * roundingFactor) / roundingFactor;
-        var yText = Math.round(this.mouseGeoCoordXY.y * roundingFactor) / roundingFactor;
-        var _units = '';
-        if (this.srs === 'EPSG:3857') {
-          _units = 'meter';
-        }
-        ctx.fillText("CoordYX: (".concat(yText, ", ").concat(xText, ") ").concat(_units), 5, this.height - 50);
-      }
-      // Mouse latlon coords
-      if (isDefined(this.mouseUpdateCoordinates)) {
-        var llCoord = this.getLatLongFromPixelCoord(this.mouseUpdateCoordinates);
-        if (isDefined(llCoord)) {
-          var _roundingFactor = 100;
+      if (this.showCursorCoordinates === true) {
+        // Mouse projected coords
+        ctx.font = '10px Helvetica';
+        ctx.textBaseline = 'middle';
+        ctx.textAlign = 'left';
+        if (isDefined(this.mouseGeoCoordXY)) {
+          var roundingFactor = 1.0 / Math.pow(10, parseInt(Math.log((this.bbox.right - this.bbox.left) / this.width) / Math.log(10), 10) - 2);
+          if (roundingFactor < 1) {
+            roundingFactor = 1;
+          }
           ctx.fillStyle = '#000000';
-          var _xText = Math.round(llCoord.x * _roundingFactor) / _roundingFactor;
-          var _yText = Math.round(llCoord.y * _roundingFactor) / _roundingFactor;
-          ctx.fillText("Lat/Lon: (".concat(_yText.toFixed(2), ", ").concat(_xText.toFixed(2), ") degrees"), 5, this.height - 38);
+          var xText = Math.round(this.mouseGeoCoordXY.x * roundingFactor) / roundingFactor;
+          var yText = Math.round(this.mouseGeoCoordXY.y * roundingFactor) / roundingFactor;
+          var _units = '';
+          if (this.srs === 'EPSG:3857') {
+            _units = 'meter';
+          }
+          ctx.fillText("CoordYX: (".concat(yText, ", ").concat(xText, ") ").concat(_units), 5, this.height - 50);
+        }
+        // Mouse latlon coords
+        if (isDefined(this.mouseUpdateCoordinates)) {
+          var llCoord = this.getLatLongFromPixelCoord(this.mouseUpdateCoordinates);
+          if (isDefined(llCoord)) {
+            var _roundingFactor = 100;
+            ctx.fillStyle = '#000000';
+            var _xText = Math.round(llCoord.x * _roundingFactor) / _roundingFactor;
+            var _yText = Math.round(llCoord.y * _roundingFactor) / _roundingFactor;
+            ctx.fillText("Lat/Lon: (".concat(_yText.toFixed(2), ", ").concat(_xText.toFixed(2), ") degrees"), 5, this.height - 38);
+          }
         }
+        ctx.fillStyle = '#000000';
+        ctx.fillText("Map projection: ".concat(this.srs), 5, this.height - 26);
       }
-      ctx.fillStyle = '#000000';
-      ctx.fillText("Map projection: ".concat(this.srs), 5, this.height - 26);
       /* Show layer metadata */
       if (this.showLayerInfo === true) {
         var metadataX = 100;
@@ -29082,6 +29098,16 @@ var WMJSMap = /*#__PURE__*/function () {
     value: function hideScaleBar() {
       this.showScaleBarInMap = false;
     }
+  }, {
+    key: "showMouseCursorProperties",
+    value: function showMouseCursorProperties() {
+      this.showCursorCoordinates = true;
+    }
+  }, {
+    key: "hideMouseCursorProperties",
+    value: function hideMouseCursorProperties() {
+      this.showCursorCoordinates = false;
+    }
   }, {
     key: "displayScaleBarInMap",
     value: function displayScaleBarInMap(display) {
@@ -29645,10 +29671,19 @@ var WMJSMap = /*#__PURE__*/function () {
           x: this.mouseDownX,
           y: this.mouseDownY
         });
+        var geoCoords = this.getGeoCoordFromPixelCoord({
+          x: this.mouseDownX,
+          y: this.mouseDownY
+        });
         this.callBack.triggerEvent('onsetmappin', {
           map: this,
           lon: mouseDownLatLon.x,
-          lat: mouseDownLatLon.y
+          lat: mouseDownLatLon.y,
+          screenOffsetX: this.mouseDownX,
+          screenOffsetY: this.mouseDownY,
+          projectionX: geoCoords.x,
+          projectionY: geoCoords.y,
+          srs: this.srs
         });
         this.mapPin.setMapPin(this.mouseDownX, this.mouseDownY);
       }
@@ -30487,6 +30522,11 @@ var WMJSMap = /*#__PURE__*/function () {
       this.zoomTo(this.defaultBBOX);
       this.draw('zoomTolayer');
     }
+  }, {
+    key: "setDefaultBBOX",
+    value: function setDefaultBBOX(bbox) {
+      this.defaultBBOX.setBBOX(bbox);
+    }
   }, {
     key: "setBBOX",
     value: function setBBOX(left, bottom, right, top) {
@@ -32484,6 +32524,13 @@ var unRegisterWMJSMap = function unRegisterWMJSMap(wmjsMapId) {
 var getWMJSMapById = function getWMJSMapById(wmjsMapId) {
   return registeredWMMapForReactMapId[wmjsMapId];
 };
+/**
+ * Get all wmjsMap id's from the lookuptable with wmjsMapId
+ * @param {string} wmjsMapId
+ */
+var getWMJSMapIds = function getWMJSMapIds() {
+  return Object.keys(registeredWMMapForReactMapId);
+};
 /**
  * Returns the WMJSDimension object for given layerId and dimension name
  * @param layerId The layerId
@@ -32525,6 +32572,7 @@ var utils = /*#__PURE__*/Object.freeze({
   registerWMJSMap: registerWMJSMap,
   unRegisterWMJSMap: unRegisterWMJSMap,
   getWMJSMapById: getWMJSMapById,
+  getWMJSMapIds: getWMJSMapIds,
   getWMJSDimensionForLayerAndDimension: getWMJSDimensionForLayerAndDimension,
   getWMJSTimeDimensionForLayerId: getWMJSTimeDimensionForLayerId
 });
@@ -33622,4 +33670,4 @@ var getCapabilities = /*#__PURE__*/Object.freeze({
   getLayersFlattenedFromService: getLayersFlattenedFromService
 });
 
-export { DateInterval, DebugType, EPSGCode, I18n, LayerType, ParseISOTimeRangeDuration, URLDecode, URLEncode, WMBBOX, WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMEmptyLayerName, WMEmptyLayerTitle, WMGetServiceFromStore, WMImage, WMImageEventType, WMJSDimension, WMJSMap, WMJSService, WMJScheckURL, WMLayer, WMTimer, clearImageCache, debugLogger, generateLayerId, generateMapId, generateTimesliderId, getCapabilities, getLegendGraphicURLForLayer, getMapImageStore, getWMJSDimensionForLayerAndDimension, getWMJSMapById, getWMJSTimeDimensionForLayerId, getWMLayerById, handleMomentISOString, isDefined, legendImageStore, mockGetCapabilities, parseISO8601DateToDate, parseISO8601IntervalToDateInterval, registerWMJSMap, registerWMLayer, tilesettings, toArray, unRegisterAllWMJSLayersAndMaps, unRegisterWMJSLayer, unRegisterWMJSMap, testSettings as webmapTestSettings, utils as webmapUtils };
+export { DateInterval, DebugType, EPSGCode, I18n, LayerType, ParseISOTimeRangeDuration, URLDecode, URLEncode, WMBBOX, WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMEmptyLayerName, WMEmptyLayerTitle, WMGetServiceFromStore, WMImage, WMImageEventType, WMJSDimension, WMJSMap, WMJSService, WMJScheckURL, WMLayer, WMTimer, buildWMSGetMapRequest, clearImageCache, debugLogger, generateLayerId, generateMapId, generateTimesliderId, getCapabilities, getLegendGraphicURLForLayer, getMapImageStore, getUriWithParam, getWMJSDimensionForLayerAndDimension, getWMJSMapById, getWMJSMapIds, getWMJSTimeDimensionForLayerId, getWMLayerById, handleMomentISOString, isDefined, legendImageStore, mockGetCapabilities, parseISO8601DateToDate, parseISO8601IntervalToDateInterval, registerWMJSMap, registerWMLayer, tilesettings, toArray, unRegisterAllWMJSLayersAndMaps, unRegisterWMJSLayer, unRegisterWMJSMap, testSettings as webmapTestSettings, utils as webmapUtils };

package/package.json

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

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

@@ -66,6 +66,7 @@ export default class WMJSMap {
     private mapIsActivated;
     private isMapHeaderEnabled;
     private showScaleBarInMap;
+    private showCursorCoordinates;
     private callBack;
     initialized: boolean;
     isDestroyed: boolean;
@@ -180,6 +181,8 @@ export default class WMJSMap {
     _makeInfoHTML(): void;
     showScaleBar(): void;
     hideScaleBar(): void;
+    showMouseCursorProperties(): void;
+    hideMouseCursorProperties(): void;
     displayScaleBarInMap(display: boolean): void;
     display(): void;
     _animFrameRedraw(): void;
@@ -212,7 +215,7 @@ export default class WMJSMap {
     onContextMenu: () => boolean;
     _buildLayerDims(): void;
     getMapMode(): string;
-    getWMSGetFeatureInfoRequestURL(layer: WMLayer, x: string, y: string, format?: string): string;
+    getWMSGetFeatureInfoRequestURL(layer: WMLayer, x: number, y: number, format?: string): string;
     setMapModeGetInfo(): void;
     setMapModeZoomBoxIn(): void;
     setMapModeZoomOut(): void;
@@ -304,6 +307,7 @@ export default class WMJSMap {
     setTimeDimension(value: string, triggerEvent: boolean): void;
     setDimension(name: string, value: string, triggerEvent?: boolean, adjustLayerDims?: boolean): void;
     zoomToLayer(_layer: WMLayer): void;
+    setDefaultBBOX(bbox: WMBBOX): void;
     setBBOX(left: number | WMBBOX, bottom?: number, right?: number, top?: number): boolean;
     zoomOut(): void;
     zoomIn(ratio: number): void;

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

@@ -1,5 +1,5 @@
 import WMJSMap, { clearImageCache } from './WMJSMap';
-import { isDefined, WMJScheckURL, URLDecode, URLEncode, toArray, debugLogger, DebugType } from './WMJSTools';
+import { isDefined, WMJScheckURL, URLDecode, URLEncode, toArray, debugLogger, DebugType, getUriWithParam } from './WMJSTools';
 import WMTimer from './WMTimer';
 import WMGetServiceFromStore from './WMGetServiceFromStore';
 import { WMDateOutSideRange, WMDateTooEarlyString, WMDateTooLateString, WMEmptyLayerName, WMEmptyLayerTitle } from './WMConstants';
@@ -9,11 +9,12 @@ import WMImage from './WMImage';
 import { getLegendGraphicURLForLayer, legendImageStore } from './WMLegend';
 import { getMapImageStore, WMImageEventType } from './WMImageStore';
 import { WMJSService } from './WMJSService';
+import { buildWMSGetMapRequest } from './WMJSMapHelpers';
 export { default as WMJSDimension, handleMomentISOString, } from './WMJSDimension';
 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, debugLogger, DebugType, WMImageEventType, WMJSService, getMapImageStore, 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, clearImageCache, buildWMSGetMapRequest, getUriWithParam, };
 export * from './types';
 export * from './WMTimeTypes';

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

@@ -2,6 +2,7 @@ import type WMJSDimension from './WMJSDimension';
 import type WMLayer from './WMLayer';
 import { Bbox } from './WMBBOX';
 import type WMImage from './WMImage';
+import type WMJSMap from './WMJSMap';
 export interface AnimationStep {
     name: string;
     value: string;
@@ -154,3 +155,9 @@ export interface WMSLayerFromGetCapabilities {
         value: string;
     }[];
 }
+export interface WMJSMapMouseClickEvent {
+    map: WMJSMap;
+    x: number;
+    y: number;
+    shiftKeyPressed: boolean;
+}

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

@@ -27,6 +27,11 @@ export declare const unRegisterWMJSMap: (wmjsMapId: string) => void;
  * @param {string} wmjsMapId
  */
 export declare const getWMJSMapById: (wmjsMapId: string) => WMJSMap;
+/**
+ * Get all wmjsMap id's from the lookuptable with wmjsMapId
+ * @param {string} wmjsMapId
+ */
+export declare const getWMJSMapIds: () => string[];
 /**
  * Returns the WMJSDimension object for given layerId and dimension name
  * @param layerId The layerId