@opengeoweb/webmap 9.4.1 → 9.6.0

package/index.esm.js

@@ -4410,6 +4410,7 @@ var WMJSMap = /*#__PURE__*/function () {
     this.rebuildMapDimensions = this.rebuildMapDimensions.bind(this);
     this.getLayerByServiceAndName = this.getLayerByServiceAndName.bind(this);
     this.getLayers = this.getLayers.bind(this);
+    this.hasLayer = this.hasLayer.bind(this);
     this.setLayer = this.setLayer.bind(this);
     this.setActive = this.setActive.bind(this);
     this.setActiveLayer = this.setActiveLayer.bind(this);
@@ -4422,6 +4423,7 @@ var WMJSMap = /*#__PURE__*/function () {
     this.removeAllLayers = this.removeAllLayers.bind(this);
     this.deleteLayer = this.deleteLayer.bind(this);
     this.moveLayerDown = this.moveLayerDown.bind(this);
+    this.reorderLayers = this.reorderLayers.bind(this);
     this.swapLayers = this.swapLayers.bind(this);
     this.moveLayerUp = this.moveLayerUp.bind(this);
     this.addLayer = this.addLayer.bind(this);
@@ -5040,6 +5042,11 @@ var WMJSMap = /*#__PURE__*/function () {
       }
       return returnlayers;
     }
+  }, {
+    key: "hasLayer",
+    value: function hasLayer(layer) {
+      return this.layers.includes(layer) || this.baseLayers.includes(layer);
+    }
   }, {
     key: "setLayer",
     value: function setLayer(layer) {
@@ -5178,6 +5185,35 @@ var WMJSMap = /*#__PURE__*/function () {
         }
       }
     }
+    /**
+     * Reorder layers according to an index array with indices on how the layers should be reordered.
+     */
+  }, {
+    key: "reorderLayers",
+    value: function reorderLayers(order) {
+      var _this5 = this;
+      // The length should be the same
+      if (order.length !== this.layers.length) {
+        return false;
+      }
+      // There should be no duplicate indices
+      if (order.length !== new Set(order).size) {
+        return false;
+      }
+      var origList = this.layers.slice();
+      var wasReordered = false;
+      order.forEach(function (value, index) {
+        if (value >= 0 || value < _this5.layers.length) {
+          var indexA = _this5.layers.length - value - 1;
+          var indexB = _this5.layers.length - index - 1;
+          if (indexA !== indexB) {
+            _this5.layers[indexA] = origList[indexB];
+            wasReordered = true;
+          }
+        }
+      });
+      return wasReordered;
+    }
   }, {
     key: "swapLayers",
     value: function swapLayers(_layerA, _layerB) {
@@ -5220,9 +5256,9 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "configureMapDimensions",
     value: function configureMapDimensions(layer) {
-      var _this5 = this;
+      var _this6 = this;
       layer.dimensions.forEach(function (dimension) {
-        var mapDim = _this5.getDimension(dimension.name);
+        var mapDim = _this6.getDimension(dimension.name);
         if ((mapDim === null || mapDim === void 0 ? void 0 : mapDim.currentValue) !== undefined && dimension.linked) {
           dimension.setClosestValue(mapDim.currentValue);
         }
@@ -5235,7 +5271,7 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "addLayer",
     value: function addLayer(layer) {
-      var _this6 = this;
+      var _this7 = this;
       return new Promise(function (resolve, reject) {
         if (!isDefined(layer)) {
           debugLogger(DebugType.Warning);
@@ -5248,12 +5284,12 @@ var WMJSMap = /*#__PURE__*/function () {
           return;
         }
         /* Set a reference in the layer to this map */
-        layer.parentMap = _this6;
-        _this6.layers.push(layer);
+        layer.parentMap = _this7;
+        _this7.layers.push(layer);
         var done = function done(layerCallback) {
-          _this6.configureMapDimensions(layerCallback);
-          _this6.callBack.triggerEvent('onlayeradd');
-          resolve(_this6);
+          _this7.configureMapDimensions(layerCallback);
+          _this7.callBack.triggerEvent('onlayeradd');
+          resolve(_this7);
         };
         layer.parseLayer(done, undefined, 'WMJSMap addLayer');
       });
@@ -5551,7 +5587,7 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "_drawAndLoad",
     value: function _drawAndLoad(inputAnimationList) {
-      var _this7 = this;
+      var _this8 = this;
       if (this.width < 4 || this.height < 4) {
         this._drawReady();
         return;
@@ -5571,16 +5607,16 @@ var WMJSMap = /*#__PURE__*/function () {
         this.mouseHoverAnimationBox = false;
         inputAnimationList.forEach(function (animationStepWithoutRequests, j) {
           if (selectedTime && animationStepWithoutRequests.value === selectedTime) {
-            _this7.currentAnimationStep = j;
+            _this8.currentAnimationStep = j;
           }
           var animationStep = {
             name: animationStepWithoutRequests.name,
             value: animationStepWithoutRequests.value,
             requests: []
           };
-          _this7.setDimension(animationStepWithoutRequests.name, animationStepWithoutRequests.value, false);
-          animationStep.requests = _this7.getWMSRequests();
-          _this7.animationList.push(animationStep);
+          _this8.setDimension(animationStepWithoutRequests.name, animationStepWithoutRequests.value, false);
+          animationStep.requests = _this8.getWMSRequests();
+          _this8.animationList.push(animationStep);
         });
         this.setDimension(this.animationList[this.currentAnimationStep].name, this.animationList[this.currentAnimationStep].value, false);
         this.wmAnimate.loopAnimation();
@@ -5606,11 +5642,11 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "getWMSRequests",
     value: function getWMSRequests(dimensionOverride) {
-      var _this8 = this;
+      var _this9 = this;
       var requests = [];
       this.layers.forEach(function (layer) {
         if (layer.service && layer.enabled) {
-          var request = buildWMSGetMapRequest(_this8, layer, dimensionOverride);
+          var request = buildWMSGetMapRequest(_this9, layer, dimensionOverride);
           if (request === null || request === void 0 ? void 0 : request.url) {
             requests.push(request);
           }
@@ -5621,7 +5657,7 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "addLayersToCanvasAndDisplayThem",
     value: function addLayersToCanvasAndDisplayThem() {
-      var _this9 = this;
+      var _this10 = this;
       debugLogger(DebugType.Log);
       this.divBuffer.reset();
       var currentLayerIndex = 0;
@@ -5629,12 +5665,12 @@ var WMJSMap = /*#__PURE__*/function () {
       this.baseLayers && this.baseLayers.forEach(function (baseLayer) {
         var _a;
         if (baseLayer.enabled && baseLayer.keepOnTop === false && baseLayer.type && baseLayer.type !== 'twms') {
-          _this9.numBaseLayers += 1;
-          var requestURL = (_a = buildWMSGetMapRequest(_this9, baseLayer)) === null || _a === void 0 ? void 0 : _a.url;
+          _this10.numBaseLayers += 1;
+          var requestURL = (_a = buildWMSGetMapRequest(_this10, baseLayer)) === null || _a === void 0 ? void 0 : _a.url;
           if (requestURL) {
-            _this9.divBuffer.setSrc(currentLayerIndex, requestURL, {
+            _this10.divBuffer.setSrc(currentLayerIndex, requestURL, {
               layer: baseLayer
-            }, baseLayer.opacity, _this9.getDrawBBOX());
+            }, baseLayer.opacity, _this10.getDrawBBOX());
             currentLayerIndex += 1;
           }
         }
@@ -5646,11 +5682,11 @@ var WMJSMap = /*#__PURE__*/function () {
       this.layers && this.layers.forEach(function (layer) {
         var _a;
         if (layer.service && layer.enabled && layer.isConfigured) {
-          var requestURL = (_a = buildWMSGetMapRequest(_this9, layer)) === null || _a === void 0 ? void 0 : _a.url;
+          var requestURL = (_a = buildWMSGetMapRequest(_this10, layer)) === null || _a === void 0 ? void 0 : _a.url;
           if (requestURL) {
-            _this9.divBuffer.setSrc(currentLayerIndex, requestURL, {
+            _this10.divBuffer.setSrc(currentLayerIndex, requestURL, {
               layer: layer
-            }, layer.opacity, _this9.getDrawBBOX());
+            }, layer.opacity, _this10.getDrawBBOX());
             currentLayerIndex += 1;
           }
         }
@@ -5658,11 +5694,11 @@ var WMJSMap = /*#__PURE__*/function () {
       this.baseLayers && this.baseLayers.forEach(function (baseLayer) {
         var _a;
         if (baseLayer.enabled && baseLayer.keepOnTop === true) {
-          var requestURL = (_a = buildWMSGetMapRequest(_this9, baseLayer)) === null || _a === void 0 ? void 0 : _a.url;
+          var requestURL = (_a = buildWMSGetMapRequest(_this10, baseLayer)) === null || _a === void 0 ? void 0 : _a.url;
           if (requestURL) {
-            _this9.divBuffer.setSrc(currentLayerIndex, requestURL, {
+            _this10.divBuffer.setSrc(currentLayerIndex, requestURL, {
               layer: baseLayer
-            }, baseLayer.opacity, _this9.getDrawBBOX());
+            }, baseLayer.opacity, _this10.getDrawBBOX());
             currentLayerIndex += 1;
           }
         }
@@ -5856,20 +5892,20 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "_buildLayerDims",
     value: function _buildLayerDims() {
-      var _this10 = this;
+      var _this11 = this;
       if (this.buildLayerDimsBusy === true) {
         return;
       }
       this.mapdimensions.forEach(function (mapDim) {
-        _this10.layers.forEach(function (layer) {
+        _this11.layers.forEach(function (layer) {
           layer.dimensions.forEach(function (layerDim) {
             if (layerDim.linked === true && layerDim.name === mapDim.name) {
               if (mapDim.currentValue === 'current' || mapDim.currentValue === 'default' || mapDim.currentValue === '' || mapDim.currentValue === 'earliest' || mapDim.currentValue === 'middle' || mapDim.currentValue === 'latest') {
                 mapDim.currentValue = layerDim.getClosestValue(mapDim.currentValue);
               }
-              _this10.buildLayerDimsBusy = true;
+              _this11.buildLayerDimsBusy = true;
               layerDim.setClosestValue(mapDim.currentValue);
-              _this10.buildLayerDimsBusy = false;
+              _this11.buildLayerDimsBusy = false;
             }
           });
         });
@@ -6598,7 +6634,7 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "zoomTo",
     value: function zoomTo(_newbbox) {
-      var _this11 = this;
+      var _this12 = this;
       debugLogger(DebugType.Log);
       var setOrigBox = false;
       var newbbox = new WMBBOX(_newbbox);
@@ -6639,14 +6675,14 @@ var WMJSMap = /*#__PURE__*/function () {
       this._updateBoundingBox(this.bbox);
       this.drawnBBOX.setBBOX(this.bbox);
       var resetMapPinAndDialogs = function resetMapPinAndDialogs() {
-        for (var j = 0; j < _this11.gfiDialogList.length; j += 1) {
-          var newpos = _this11.getPixelCoordFromGeoCoord({
-            x: _this11.gfiDialogList[j].geoPosX,
-            y: _this11.gfiDialogList[j].geoPosY
+        for (var j = 0; j < _this12.gfiDialogList.length; j += 1) {
+          var newpos = _this12.getPixelCoordFromGeoCoord({
+            x: _this12.gfiDialogList[j].geoPosX,
+            y: _this12.gfiDialogList[j].geoPosY
           });
-          if (_this11.gfiDialogList[j].hasBeenDragged === false) {
-            if (_this11.gfiDialogList[j].moveToMouseCursor === true) {
-              _this11.gfiDialogList[j].setXY(_this11.gfiDialogList[j].origX + newpos.x, _this11.gfiDialogList[j].origY + newpos.y);
+          if (_this12.gfiDialogList[j].hasBeenDragged === false) {
+            if (_this12.gfiDialogList[j].moveToMouseCursor === true) {
+              _this12.gfiDialogList[j].setXY(_this12.gfiDialogList[j].origX + newpos.x, _this12.gfiDialogList[j].origY + newpos.y);
             }
           }
         }
@@ -8243,6 +8279,9 @@ var WMLayer = /*#__PURE__*/function () {
       if (options.headers) {
         this.headers = options.headers;
       }
+      if (options.geojson) {
+        this.geojson = options.geojson;
+      }
     }
   }
   _createClass(WMLayer, [{
@@ -8577,10 +8616,7 @@ var WMLayer = /*#__PURE__*/function () {
       var layerDoneCallback = function layerDoneCallback(__layer) {
         if (isDefined(_layerDoneCallback)) {
           try {
-            /* Enable these two console timings to do performance measurments of parseLayer */
-            // console.time(origin);
             _layerDoneCallback(__layer);
-            // console.timeEnd(origin);
           } catch (e) {
             debugLogger(DebugType.Error, e.message);
           }

package/package.json

@@ -1,12 +1,21 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "9.4.1",
+  "version": "9.6.0",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
+  "dependencies": {
+    "@opengeoweb/shared": "*",
+    "throttle-debounce": "^5.0.0",
+    "moment": "^2.29.4",
+    "proj4": "^2.9.2",
+    "lodash": "^4.17.21",
+    "date-fns": "^3.3.0"
+  },
+  "peerDependencies": {},
   "module": "./index.esm.js",
   "type": "module",
   "main": "./index.esm.js"

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

@@ -128,6 +128,7 @@ export default class WMJSMap {
     rebuildMapDimensions(): void;
     getLayerByServiceAndName(layerService: string, layerName: string): WMLayer;
     getLayers(): WMLayer[];
+    hasLayer(layer: WMLayer): boolean;
     setLayer(layer: WMLayer): Promise<unknown>;
     setActive(active: boolean): void;
     setActiveLayer(layer: WMLayer): void;
@@ -140,6 +141,10 @@ export default class WMJSMap {
     removeAllLayers(): void;
     deleteLayer(layerToDelete: WMLayer): void;
     moveLayerDown(layerToMove: WMLayer): void;
+    /**
+     * Reorder layers according to an index array with indices on how the layers should be reordered.
+     */
+    reorderLayers(order: number[]): boolean;
     swapLayers(_layerA: WMLayer, _layerB: WMLayer): void;
     moveLayerUp(layerToMove: WMLayer): void;
     configureMapDimensions(layer: WMLayer): void;

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

@@ -43,6 +43,7 @@ export interface LayerOptions extends LayerFoundation {
     ReactWMJSLayerId?: string;
     onLayerError?: (layer: WMLayer, error: Error, webmapInstance: WMJSMap) => void;
     onLayerReady?: (layer: WMLayer, webmap?: WMJSMap) => void;
+    geojson?: GeoJSON.FeatureCollection;
 }
 /**
  * Helper function to figure out the dimensions from the WMS layer object (From WMS GetCapabilities). Parses both WMS 1.1.1 and WMS 1.3.0.
@@ -114,6 +115,7 @@ export default class WMLayer {
     };
     isConfigured: boolean;
     geographicBoundingBox?: GeographicBoundingBox;
+    geojson?: GeoJSON.FeatureCollection;
     init(): void;
     constructor(options?: LayerOptions);
     getLayerName(): string;