@opengeoweb/core 19.3.0 → 19.4.0

package/dist/index.esm.js

@@ -23,7 +23,6 @@ import { bbox } from '@turf/turf';
 import proj4 from 'proj4';
 import { getIntersection } from 'ol/extent';
 import GeoJSON from 'ol/format/GeoJSON';
-import axios from 'axios';
 import { ImageWMS } from 'ol/source';
 import DOMPurify from 'dompurify';
 import { snackbarTypes, snackbarActions, SnackbarWrapperConnect } from '@opengeoweb/snackbar';
@@ -8553,6 +8552,64 @@ var getTitle = function getTitle(layerId) {
   var wmjsLayer = webmapUtils.getWMLayerById(layerId);
   return wmjsLayer ? wmjsLayer.title || wmjsLayer.name : layerId;
 };
+var getWmtsFeatureInfoUrl = function getWmtsFeatureInfoUrl(wmjsLayer, layer, mapPinLocation) {
+  var _layer$dimensions;
+  (_layer$dimensions = layer.dimensions) == null || _layer$dimensions.forEach(function (dim) {
+    var wmDim = wmjsLayer == null ? void 0 : wmjsLayer.getDimension(dim.name);
+    if (wmDim && wmDim.getValue() !== dim.currentValue) {
+      wmDim.setValue(dim.currentValue);
+    }
+  });
+  var wmtsSource = wmjsLayer == null ? void 0 : wmjsLayer.olSource;
+  if (!wmtsSource || !(wmjsLayer != null && wmjsLayer.getfeatureinfoURL)) {
+    return '';
+  }
+  var tileGrid = wmtsSource.getTileGrid();
+  var tileCoord = tileGrid.getTileCoordForCoordAndResolution([mapPinLocation.projectionX, mapPinLocation.projectionY], mapPinLocation.resolution);
+  if (!tileCoord) {
+    return '';
+  }
+  var z = tileCoord[0],
+    tileCol = tileCoord[1],
+    tileRow = tileCoord[2];
+  var tileExtent = tileGrid.getTileCoordExtent(tileCoord);
+  var tileResolution = tileGrid.getResolution(z);
+  var tileSize = tileGrid.getTileSize(z);
+  var tileWidth = Array.isArray(tileSize) ? tileSize[0] : tileSize;
+  var tileHeight = Array.isArray(tileSize) ? tileSize[1] : tileSize;
+  if (!tileResolution || !tileWidth || !tileHeight) {
+    return '';
+  }
+  var i = Math.min(Math.max(Math.floor((mapPinLocation.projectionX - tileExtent[0]) / tileResolution), 0), tileWidth - 1);
+  var pixelJ = Math.min(Math.max(Math.floor((tileExtent[3] - mapPinLocation.projectionY) / tileResolution), 0), tileHeight - 1);
+  var matrixIds = (tileGrid.getMatrixIds == null ? void 0 : tileGrid.getMatrixIds()) || [];
+  var tileMatrix = matrixIds[z] || "" + z;
+  var params = new URLSearchParams();
+  params.set('SERVICE', 'WMTS');
+  params.set('REQUEST', 'GetFeatureInfo');
+  params.set('VERSION', '1.0.0');
+  params.set('LAYER', wmjsLayer.getLayerName());
+  params.set('STYLE', wmjsLayer.getStyle() || 'default');
+  params.set('TILEMATRIXSET', wmjsLayer.wmtsTileMatrixSet || 'EPSG:3857');
+  params.set('TILEMATRIX', tileMatrix);
+  params.set('TILEROW', "" + tileRow);
+  params.set('TILECOL', "" + tileCol);
+  params.set('I', "" + i);
+  params.set('J', "" + pixelJ);
+  params.set('INFOFORMAT', wmjsLayer.wmtsInfoFormat || 'text/html');
+  var mapDimURL = getMapDimURL(wmjsLayer).toString();
+  if (mapDimURL) {
+    var dimParams = new URLSearchParams(mapDimURL);
+    dimParams.forEach(function (value, key) {
+      params.set(key.toUpperCase(), value);
+    });
+  }
+  var featureInfoUrl = new URL(wmjsLayer.getfeatureinfoURL);
+  params.forEach(function (value, key) {
+    featureInfoUrl.searchParams.set(key, value);
+  });
+  return featureInfoUrl.toString();
+};
 var getFeatureInfoUrl = function getFeatureInfoUrl(layer, mapPinLocation) {
   /*
     We need a wmjsLayer to build the getfeatureinfo url (getWMSGetFeatureInfoRequestURL function).
@@ -8560,13 +8617,13 @@ var getFeatureInfoUrl = function getFeatureInfoUrl(layer, mapPinLocation) {
     Therefore make a clone of this layer and set its dimensions based on the layer object.
     Otherwise we risk making a getfeatureinfo call with outdated dimension values.
   */
-  var wmjsLayer = webmapUtils.getWMLayerById(layer.id).cloneLayer();
-  if (wmjsLayer.layerType === LayerType.wmtsMapLayer) {
-    // WMTS Layers do not support GetFeatureInfo
-    return '';
-  }
+  var originalWmjsLayer = webmapUtils.getWMLayerById(layer.id);
+  var wmjsLayer = originalWmjsLayer.cloneLayer();
   if (mapPinLocation) {
-    var _layer$dimensions;
+    var _layer$dimensions2;
+    if (wmjsLayer.layerType === LayerType.wmtsMapLayer) {
+      return getWmtsFeatureInfoUrl(wmjsLayer, layer, mapPinLocation);
+    }
     // OpenLayers WMS version
     var source = new ImageWMS({
       url: wmjsLayer.getmapURL,
@@ -8574,7 +8631,7 @@ var getFeatureInfoUrl = function getFeatureInfoUrl(layer, mapPinLocation) {
         LAYERS: wmjsLayer.getLayerName()
       }
     });
-    (_layer$dimensions = layer.dimensions) == null || _layer$dimensions.forEach(function (dim) {
+    (_layer$dimensions2 = layer.dimensions) == null || _layer$dimensions2.forEach(function (dim) {
       var wmDim = wmjsLayer.getDimension(dim.name);
       if (wmDim && wmDim.getValue() !== dim.currentValue) {
         wmDim.setValue(dim.currentValue);
@@ -8708,7 +8765,7 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
   /* Do a GFI call to the server and use the updateLayerResult to provide the results. */
   var fetchLayerInfo = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(url, layerId) {
-      var _yield$axios$get, data, errorMessage, _t;
+      var response, data, errorMessage, _t;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.p = _context.n) {
           case 0:
@@ -8730,19 +8787,28 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
               isLoading: true
             });
             _context.n = 2;
-            return axios.get(url);
+            return fetch(url);
           case 2:
-            _yield$axios$get = _context.v;
-            data = _yield$axios$get.data;
+            response = _context.v;
+            if (response.ok) {
+              _context.n = 3;
+              break;
+            }
+            throw new Error("GetFeatureInfo request failed (" + response.status + ")");
+          case 3:
+            _context.n = 4;
+            return response.text();
+          case 4:
+            data = _context.v;
             updateLayerResult({
               layerId: layerId,
               data: data,
               isLoading: false
             });
-            _context.n = 4;
+            _context.n = 6;
             break;
-          case 3:
-            _context.p = 3;
+          case 5:
+            _context.p = 5;
             _t = _context.v;
             errorMessage = _t instanceof Error ? _t.message : 'fetchLayerInfo failed';
             updateLayerResult({
@@ -8750,10 +8816,10 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
               data: errorMessage,
               isLoading: false
             });
-          case 4:
+          case 6:
             return _context.a(2);
         }
-      }, _callee, null, [[1, 3]]);
+      }, _callee, null, [[1, 5]]);
     }));
     return function fetchLayerInfo(_x, _x2) {
       return _ref3.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "19.3.0",
+  "version": "19.4.0",
   "description": "GeoWeb Core library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -28,7 +28,6 @@
     "@opengeoweb/webmap-react": "*",
     "@opengeoweb/webmap": "*",
     "@opengeoweb/theme": "*",
-    "axios": "^1.18.0",
     "@opengeoweb/layer-select": "*",
     "lodash": "^4.18.1",
     "ol": "^10.4.0",