@opengeoweb/core 19.2.0 → 19.4.0

package/dist/index.esm.js

@@ -4,8 +4,8 @@ import React, { useMemo, useState, useCallback, useEffect, useContext } from 're
 import { safelyInitI18nForTestsAndStories, sharedTranslations, SHARED_NAMESPACE, TooltipSelect, CustomIconButton, CustomDialog, CustomTooltip, ToggleMenu, AlertIcon, useConfirmationDialog, useScrollingInIsolation, sliderHeaderStyle, CustomSlider, tooltipContainerStyles, renderCounter, AlertBanner, CustomAccordion, PROJECTION, calculateStartSize, useWheelStopPropagation, ToolContainerDraggable, dateUtils, sessionStorageProvider, useDebounce, usePrevious } from '@opengeoweb/shared';
 import { webmapUtils, queryWMSLayersTree, invalidateWMSGetCapabilities, LayerType, WMDefaultStyleName, WMJSMAP_LONLAT_EPSGCODE, queryWMSServiceInfo, queryWMSLayers, getWMSServiceId, handleDateUtilsISOString, generateLayerId, WMJSDimension, getWMLayerById, getMapDimURL, WMLayer } from '@opengeoweb/webmap';
 import _, { isEqual, isArray, range, zip, throttle } from 'lodash';
-import { useDispatch, useSelector, connect, useStore, Provider } from 'react-redux';
-import { mapSelectors, layerSelectors, layerActions, layerTypes, filterLayers, mapActions, mapEnums, loadingIndicatorSelectors, layerUtils, serviceSelectors, serviceActions, uiSelectors, uiTypes, useSetupDialog, getUserAddedServices, uiActions, genericActions, drawingToolSelectors, syncGroupsSelectors, syncConstants, getViewObjectForSyncGroup, getViewObjectForMapId, loadingIndicatorActions, genericSelectors, defaultLayers, getSingularDrawtoolDrawLayerId, syncGroupsSelector, syncGroupsActions, routerUtils, mapUtils } from '@opengeoweb/store';
+import { useDispatch, useSelector, connect, useStore, shallowEqual, Provider } from 'react-redux';
+import { mapSelectors, layerSelectors, layerActions, layerTypes, filterLayers, mapActions, mapEnums, loadingIndicatorSelectors, layerUtils, serviceSelectors, serviceActions, uiSelectors, uiTypes, useSetupDialog, getUserAddedServices, uiActions, genericActions, drawingToolSelectors, syncGroupsSelectors, syncConstants, getViewObjectForSyncGroup, getViewObjectForMapId, loadingIndicatorActions, genericSelectors, PUBLIC_WARNING_DRAW_TOOL_ID, defaultLayers, getSingularDrawtoolDrawLayerId, syncGroupsSelector, syncGroupsActions, routerUtils, mapUtils } from '@opengeoweb/store';
 import i18n from 'i18next';
 import { useTranslation, Trans, I18nextProvider } from 'react-i18next';
 import { TIME_SLIDER_NAMESPACE, timesliderTranslations, defaultTimeSpan, AnimationLengthButton, AnimationLength, AutoUpdateButton, BackwardForwardStepButton, NowButton, handleSetNowEvent, PlayButton, defaultTimeStep, SpeedButton, TimeSpanButton, secondsPerPxFromCanvasWidth, getNewCenterOfFixedPointZoom, TimeStepButton, OptionsMenuButton, TimeSliderButtons, TimeSliderCurrentTimeBox, TimeSliderLegend, onsetNewDateDebounced, getFilteredTime, defaultSecondsPerPx, moveSelectedTimePx, TimeSlider } from '@opengeoweb/time-slider';
@@ -14,7 +14,7 @@ import { Cached, Add, MapAdd, CollapseSmall, CollapseMedium, CollapseLarge, Coll
 import { ReactSortable } from 'react-sortablejs';
 import Sortable from 'sortablejs';
 import { Box as Box$1, Stack } from '@mui/system';
-import { transformExtent, toLonLat } from 'ol/proj';
+import { transformExtent, toLonLat, fromLonLat } from 'ol/proj';
 import { LayerSelectButtonConnect, LayerSelectConnect, DataExplorerButtonConnect } from '@opengeoweb/layer-select';
 import { unByKey } from 'ol/Observable';
 import { useQuery, QueryClient, QueryClientProvider } from '@tanstack/react-query';
@@ -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';
@@ -2944,6 +2943,9 @@ var DeleteLayerConnect = function DeleteLayerConnect(_ref) {
   var layerType = useSelector(function (store) {
     return layerSelectors.getLayerType(store, layerId);
   });
+  var isFeatureSyncLayer = useSelector(function (store) {
+    return layerSelectors.getIsFeatureSyncLayer(store, layerId);
+  });
   var isLayerEnabled = useSelector(function (store) {
     return layerSelectors.getLayerEnabled(store, layerId);
   });
@@ -2960,6 +2962,9 @@ var DeleteLayerConnect = function DeleteLayerConnect(_ref) {
   var onDelete = React.useCallback(function (_ref3) {
     var mapId = _ref3.mapId,
       layerId = _ref3.layerId;
+    if (isFeatureSyncLayer) {
+      return;
+    }
     if (layerType === LayerType.edrFeatureLayer) {
       void confirmationDialog({
         title: t('delete-dialog-title'),
@@ -2978,16 +2983,17 @@ var DeleteLayerConnect = function DeleteLayerConnect(_ref) {
         layerId: layerId
       });
     }
-  }, [layerType, confirmationDialog, t, layerDelete]);
+  }, [isFeatureSyncLayer, layerType, confirmationDialog, t, layerDelete]);
   return jsx(CustomIconButton, {
     "data-testid": "deleteButton",
+    disabled: isFeatureSyncLayer,
     onClick: function onClick() {
       return onDelete({
         mapId: mapId,
         layerId: layerId
       });
     },
-    shouldShowAsDisabled: !isLayerEnabled,
+    shouldShowAsDisabled: !isLayerEnabled || isFeatureSyncLayer,
     tooltipTitle: nonEmptyTooltipTitle,
     children: icon
   });
@@ -3277,10 +3283,15 @@ var useLoadDurationLabel = function useLoadDurationLabel(mapId, layerId) {
 var SelectableFeatures = function SelectableFeatures(_ref) {
   var layerId = _ref.layerId,
     isSelectable = _ref.isSelectable,
-    onToggleSelectable = _ref.onToggleSelectable;
+    onToggleSelectable = _ref.onToggleSelectable,
+    _ref$disabled = _ref.disabled,
+    disabled = _ref$disabled === void 0 ? false : _ref$disabled;
   var _useCoreTranslation = useCoreTranslation(),
     t = _useCoreTranslation.t;
   var onClickCheckbox = function onClickCheckbox() {
+    if (disabled) {
+      return;
+    }
     onToggleSelectable();
   };
   return jsx(ListItem, {
@@ -3291,7 +3302,9 @@ var SelectableFeatures = function SelectableFeatures(_ref) {
       borderBottom: '1px solid #E0E0E0'
     },
     children: jsxs(ListItemButton, {
+      "data-testid": "selectablefeatures-checkbox-" + layerId,
       disableGutters: true,
+      disabled: disabled,
       onClick: function onClick() {
         return onClickCheckbox();
       },
@@ -3316,8 +3329,8 @@ var SelectableFeatures = function SelectableFeatures(_ref) {
         },
         children: jsx(Checkbox, {
           checked: isSelectable,
-          "data-testid": "selectablefeatures-checkbox-" + layerId,
           disableRipple: true,
+          disabled: disabled,
           name: "selectablefeatures-checkbox-" + layerId,
           tabIndex: -1
         })
@@ -3327,7 +3340,8 @@ var SelectableFeatures = function SelectableFeatures(_ref) {
 };
 
 var SelectableFeaturesCheckboxConnect = function SelectableFeaturesCheckboxConnect(_ref) {
-  var layerId = _ref.layerId;
+  var layerId = _ref.layerId,
+    disabled = _ref.disabled;
   var dispatch = useDispatch();
   var isSelectable = useSelector(function (store) {
     return layerSelectors.getIsLayerSelectable(store, layerId);
@@ -3338,6 +3352,7 @@ var SelectableFeaturesCheckboxConnect = function SelectableFeaturesCheckboxConne
     }));
   }, [dispatch, layerId]);
   return jsx(SelectableFeatures, {
+    disabled: disabled,
     isSelectable: isSelectable,
     layerId: layerId,
     onToggleSelectable: toggleSelectable
@@ -3349,6 +3364,8 @@ var LayerManagerMenuButton = function LayerManagerMenuButton(_ref) {
     layerId = _ref.layerId,
     _ref$isFeatureLayer = _ref.isFeatureLayer,
     isFeatureLayer = _ref$isFeatureLayer === void 0 ? false : _ref$isFeatureLayer,
+    _ref$isFeatureSyncLay = _ref.isFeatureSyncLayer,
+    isFeatureSyncLayer = _ref$isFeatureSyncLay === void 0 ? false : _ref$isFeatureSyncLay,
     onLayerDuplicate = _ref.onLayerDuplicate,
     onLayerCopyToOtherMaps = _ref.onLayerCopyToOtherMaps,
     onLayerRemoveFromOtherMaps = _ref.onLayerRemoveFromOtherMaps,
@@ -3388,15 +3405,18 @@ var LayerManagerMenuButton = function LayerManagerMenuButton(_ref) {
     menuItems: [{
       text: t('layermanager-layer-duplicate'),
       action: onClickDuplicate,
-      icon: jsx(Copy, {})
+      icon: jsx(Copy, {}),
+      isDisabled: isFeatureSyncLayer
     }, {
       text: t('layermanager-layer-duplicate-to-other-maps'),
       action: onClickCopyToOtherMaps,
-      icon: jsx(Copy, {})
+      icon: jsx(Copy, {}),
+      isDisabled: isFeatureSyncLayer
     }, {
       text: t('layermanager-layer-remove-from-other-maps'),
       action: onClickRemoveFromOtherMaps,
-      icon: jsx(Delete, {})
+      icon: jsx(Delete, {}),
+      isDisabled: isFeatureSyncLayer
     }, {
       text: t('layermanager-layer-zoom-to-extent'),
       action: onClickZoomToExtent,
@@ -3406,6 +3426,7 @@ var LayerManagerMenuButton = function LayerManagerMenuButton(_ref) {
     menuPosition: "bottom",
     tooltipTitle: nonEmptyTooltipTitle,
     children: !!isFeatureLayer && jsx(SelectableFeaturesCheckboxConnect, {
+      disabled: isFeatureSyncLayer,
       layerId: layerId
     })
   });
@@ -4320,6 +4341,9 @@ var LayerManagerMenuButtonConnect = function LayerManagerMenuButtonConnect(_ref)
   var layerType = useSelector(function (store) {
     return layerSelectors.getLayerType(store, layerId);
   });
+  var isFeatureSyncLayer = useSelector(function (store) {
+    return layerSelectors.getIsFeatureSyncLayer(store, layerId);
+  });
   var isFeatureLayer = layerType === LayerType.featureLayer;
   var mapSrs = useSelector(function (store) {
     return mapSelectors.getSrs(store, mapId);
@@ -4428,6 +4452,7 @@ var LayerManagerMenuButtonConnect = function LayerManagerMenuButtonConnect(_ref)
     canZoomToLayerExtent: canZoomToLayerExtent,
     icon: icon,
     isFeatureLayer: isFeatureLayer,
+    isFeatureSyncLayer: isFeatureSyncLayer,
     layerId: layerId,
     mapId: mapId,
     onLayerCopyToOtherMaps: copyLayerToOtherMaps,
@@ -5977,24 +6002,30 @@ var useFetchServices = function useFetchServices(dialogType, preloadedServices,
     shouldDisableFetch = false;
   }
   var dispatch = useDispatch();
+  var store = useStore();
   var isOpenInStore = useSelector(function (store) {
     return uiSelectors.getisDialogOpen(store, dialogType);
   });
-  var services = useSelector(function (store) {
-    return serviceSelectors.getServiceIds(store);
-  });
   var fetchInitialServices = useCallback(function (services) {
     dispatch(serviceActions.fetchInitialServices({
       services: services
     }));
   }, [dispatch]);
   useEffect(function () {
-    if (!shouldDisableFetch && isOpenInStore && preloadedServices && preloadedServices.length > 0 && !services.length) {
+    if (!shouldDisableFetch && isOpenInStore && preloadedServices && preloadedServices.length > 0) {
       var allServicesToLoad = mergePresetsAndUserAddedServices(preloadedServices, getUserAddedServices());
-      void getServicesToLoad(allServicesToLoad).then(fetchInitialServices);
+      void getServicesToLoad(allServicesToLoad).then(function (servicesToLoad) {
+        var currentServiceIds = serviceSelectors.getServiceIds(store.getState());
+        var missingServices = servicesToLoad.filter(function (service) {
+          return !currentServiceIds.includes(service.id);
+        });
+        if (missingServices.length > 0) {
+          fetchInitialServices(missingServices);
+        }
+      });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isOpenInStore, services]);
+  }, [isOpenInStore]);
 };
 var mergePresetsAndUserAddedServices = function mergePresetsAndUserAddedServices(presets, userAddedServices) {
   return Object.values(Object.assign({}, presets.reduce(function (byUrl, preset) {
@@ -7874,7 +7905,9 @@ var createLinkedFeatureCollection = function createLinkedFeatureCollection(linke
       var isSelected = selectedFeatureIds == null ? void 0 : selectedFeatureIds.has((_getGeoFeatureSelecti = getGeoFeatureSelectionKey(geoFeature)) != null ? _getGeoFeatureSelecti : '');
       var existingProperties = geoFeature.properties && typeof geoFeature.properties === 'object' ? geoFeature.properties : {};
       return Object.assign({}, geoFeature, {
-        properties: Object.assign({}, existingProperties, isSelected ? {
+        properties: Object.assign({}, existingProperties, {
+          sourceLayerId: featureLayer.id
+        }, isSelected ? {
           highlightSelectedFeature: true
         } : undefined, featureLayer.originalId ? {
           originalId: featureLayer.originalId
@@ -8372,6 +8405,7 @@ var OpenLayersFeatureLayerConnect = function OpenLayersFeatureLayerConnect(_ref2
       } : undefined,
       featureCollection: !layer.isInEditMode ? displayGeojson : undefined,
       hoverSelect: hoverSelect,
+      layerId: layerId,
       opacity: layer.opacity,
       style: style,
       visible: layer.enabled,
@@ -8518,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).
@@ -8525,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,
@@ -8539,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);
@@ -8599,6 +8691,32 @@ var sanitizeHTML = function sanitizeHTML(htmlToBeSanitized) {
   };
 };
 
+var getMapPinLocation = function getMapPinLocation(mapPinLocation, map) {
+  if (!mapPinLocation) {
+    return undefined;
+  }
+  if (mapPinLocation.projectionX !== undefined && mapPinLocation.projectionY !== undefined && mapPinLocation.resolution !== undefined && mapPinLocation.srs) {
+    return mapPinLocation;
+  }
+  if (!map) {
+    return mapPinLocation;
+  }
+  var view = map.getView();
+  var projection = view == null ? void 0 : view.getProjection();
+  var resolution = view == null ? void 0 : view.getResolution();
+  if (!projection || resolution === undefined) {
+    return mapPinLocation;
+  }
+  var _fromLonLat = fromLonLat([mapPinLocation.lon, mapPinLocation.lat], projection),
+    projectionX = _fromLonLat[0],
+    projectionY = _fromLonLat[1];
+  return Object.assign({}, mapPinLocation, {
+    projectionX: projectionX,
+    projectionY: projectionY,
+    resolution: resolution,
+    srs: projection.getCode()
+  });
+};
 var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
   var layers = _ref.layers,
     isOpen = _ref.isOpen,
@@ -8615,8 +8733,10 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
     mapPinLocation = _ref.mapPinLocation;
   var _useCoreTranslation = useCoreTranslation(),
     t = _useCoreTranslation.t;
+  var _React$useContext = React.useContext(MapContext),
+    map = _React$useContext.map;
   /* Ref, state and update function for results per layer map */
-  var gfiResultMap = React.useRef(new Map()).current;
+  var gfiResultMap = React.useRef(new globalThis.Map()).current;
   // eslint-disable-next-line react/hook-use-state
   var _React$useState = React.useState(),
     triggerRerender = _React$useState[1];
@@ -8631,7 +8751,10 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
     triggerRerender("" + layerId + isLoading);
   };
   /* Build a layerlist array with a set of arguments per layer to do the query for */
-  var layerToUpdateList = isOpen && mapPinLocation ? getLayersToUpdate(mapPinLocation, layers) : [];
+  var mapPinLocationCoordinates = React.useMemo(function () {
+    return getMapPinLocation(mapPinLocation, map);
+  }, [map, mapPinLocation]);
+  var layerToUpdateList = isOpen && mapPinLocationCoordinates ? getLayersToUpdate(mapPinLocationCoordinates, layers) : [];
   /*
     Build a string based on the GFI urls. If this changes for whatever reason we need to update.
     These strings can change very often, therefore they need to be debounced and only use the most recent result  must be used.
@@ -8642,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:
@@ -8664,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({
@@ -8684,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);
@@ -8695,7 +8827,7 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
   }();
   /* For each changed getfeature url string, load new data using WMS GetFeatureInfo */
   React.useEffect(function () {
-    if (mapPinLocation && isOpen) {
+    if (mapPinLocationCoordinates && isOpen) {
       layerToUpdateList.forEach(function (_ref4) {
         var url = _ref4.url,
           layerId = _ref4.layerId;
@@ -8725,7 +8857,7 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
       sx: {
         padding: 0
       },
-      children: [!!isOpen && !!hasLayers && !!mapPinLocation && jsx(Box, {
+      children: [!!isOpen && !!hasLayers && !!mapPinLocationCoordinates && jsx(Box, {
         "data-testid": "GetFeatureInfoList",
         ref: stopWheelEventPropagationRef,
         children: layerToUpdateList.map(function (layer) {
@@ -8778,7 +8910,7 @@ var GetFeatureInfoDialog = function GetFeatureInfoDialog(_ref) {
             })]
           }, layerId);
         })
-      }), !!hasLayers && !mapPinLocation && jsx(Typography, {
+      }), !!hasLayers && !mapPinLocationCoordinates && jsx(Typography, {
         "data-testid": "click-on-map-for-info",
         sx: {
           padding: '10px'
@@ -9050,12 +9182,24 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
     });
     return visibilityById;
   }, [layersState]);
-  var warningDialogFeatureLayers = useSelector(function (state) {
+  var allWarningDialogFeatureLayers = useSelector(function (state) {
     return genericSelectors.selectFeatureSyncLayersForPanel(state, 'warning-dialog');
   });
+  var warningDialogFeatureLayers = React.useMemo(function () {
+    return allWarningDialogFeatureLayers.filter(function (layer) {
+      return layer.mapId === mapId;
+    });
+  }, [allWarningDialogFeatureLayers, mapId]);
   var warningDialogFeatures = React.useMemo(function () {
     return createWarningDialogFeatureLayers(warningDialogFeatureLayers);
   }, [warningDialogFeatureLayers]);
+  var hasPublicWarningDrawLayer = featureLayers.some(function (layer) {
+    var _layer$id;
+    return (_layer$id = layer.id) == null ? void 0 : _layer$id.startsWith("drawLayer-" + PUBLIC_WARNING_DRAW_TOOL_ID + "-");
+  });
+  var warningDialogFeaturesForHighlight = React.useMemo(function () {
+    return hasPublicWarningDrawLayer ? [] : warningDialogFeatures;
+  }, [hasPublicWarningDrawLayer, warningDialogFeatures]);
   var warningDialogFeatureKeys = React.useMemo(function () {
     return createWarningDialogFeatureKeys(warningDialogFeatures);
   }, [warningDialogFeatures]);
@@ -9064,11 +9208,6 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
   var linkedFeaturesFromState = useSelector(function (store) {
     return genericSelectors.selectLinkedFeatureLayersForMap(store, mapId);
   });
-  // Form-specific features (draft/edit geometries) from linked panels.
-  // Kept separate from linkedFeatures so edit-mode filtering can be applied.
-  var linkedFormFeaturesFromState = useSelector(function (store) {
-    return genericSelectors.selectLinkedFormFeaturesForMap(store, mapId);
-  });
   // Raw shared-data payload grouped per linked panel id.
   // Needed for ownership lookup (feature key -> panel id(s)) when routing
   // selection/hover updates back to the correct source panel(s).
@@ -9099,19 +9238,6 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
       return featureCollection.features.length > 0;
     });
   }, [featureSyncLayerVisibilityById, linkedFeaturesFromState, selectedFeatureIdsByLayerKey, warningDialogFeatureKeys]);
-  var linkedFormFeatures = React.useMemo(function () {
-    return {
-      type: 'FeatureCollection',
-      features: linkedFormFeaturesFromState.flatMap(function (feature) {
-        var _feature$geoJSON$feat;
-        // Filter out any form features currently in Edit mode
-        if ((_feature$geoJSON$feat = feature.geoJSON.features[0]) != null && (_feature$geoJSON$feat = _feature$geoJSON$feat.properties) != null && _feature$geoJSON$feat.inEditMode) {
-          return [];
-        }
-        return feature.geoJSON.features;
-      })
-    };
-  }, [linkedFormFeaturesFromState]);
   var srs = useSelector(function (store) {
     return mapSelectors.getSrs(store, mapId);
   });
@@ -9200,20 +9326,43 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
   var disableMapPin = useSelector(function (store) {
     return mapSelectors.getDisableMapPin(store, mapId);
   });
+  var isCurrentMapDrawToolActive = useSelector(function (state) {
+    return drawingToolSelectors.selectAllDrawingTools(state).some(function (tool) {
+      var _layerSelectors$getLa;
+      if (!tool.activeDrawModeId) {
+        return false;
+      }
+      return ((_layerSelectors$getLa = layerSelectors.getLayerById(state, tool.geoJSONLayerId)) == null ? void 0 : _layerSelectors$getLa.mapId) === mapId;
+    });
+  });
+  var drawToolLayerIds = useSelector(function (state) {
+    return drawingToolSelectors.selectAllDrawingTools(state).map(function (tool) {
+      return tool.geoJSONLayerId;
+    }).filter(function (layerId) {
+      return Boolean(layerId);
+    });
+  }, shallowEqual);
+  var shouldHandleMapPinClick = React.useCallback(function (event) {
+    var clickedLayerIds = new Set();
+    event.map.forEachFeatureAtPixel(event.pixel, function (_feature, layerAtPixel) {
+      var layerId = layerAtPixel == null ? void 0 : layerAtPixel.get('layerId');
+      if (typeof layerId === 'string') {
+        clickedLayerIds.add(layerId);
+      }
+    });
+    return !drawToolLayerIds.some(function (layerId) {
+      return clickedLayerIds.has(layerId);
+    });
+  }, [drawToolLayerIds]);
   var mapPinChangeLocation = React.useCallback(function (clickedLocation) {
-    var _hoverLinkedFeature$g, _hoverLinkedFeature$g2;
-    if (disableMapPin) {
+    var _hoverLinkedFeature$g, _hoverLinkedFeature$g2, _hoverLinkedFeature$g3;
+    if (disableMapPin || isCurrentMapDrawToolActive) {
       return;
     }
     var mapPinLocation = getCenterOfLinkedFeature(hoverLinkedFeature, srs) || clickedLocation;
     var selectedFeatureId = (hoverLinkedFeature == null || (_hoverLinkedFeature$g = hoverLinkedFeature.getId()) == null ? void 0 : _hoverLinkedFeature$g.toString()) || (hoverLinkedFeature == null || (_hoverLinkedFeature$g2 = hoverLinkedFeature.get('originalId')) == null ? void 0 : _hoverLinkedFeature$g2.toString()) || '';
-    var shouldMirrorSelectionToDrawLayer = hoverLinkedFeature && hoverLinkedFeature.get('isReadonly') !== true;
-    if (shouldMirrorSelectionToDrawLayer) {
-      dispatch(layerActions.setSelectedFeatures({
-        layerId: "drawlayer-" + mapId,
-        selectedFeatureIds: selectedFeatureId ? [selectedFeatureId] : []
-      }));
-    }
+    var hoveredFeatureSourceLayerId = hoverLinkedFeature == null || (_hoverLinkedFeature$g3 = hoverLinkedFeature.get('sourceLayerId')) == null ? void 0 : _hoverLinkedFeature$g3.toString();
+    var isHoveredFeatureSyncLayer = hoveredFeatureSourceLayerId ? layerSelectors.getIsFeatureSyncLayer(store.getState(), hoveredFeatureSourceLayerId) : false;
     var state = store.getState();
     var directlyLinkedPanelIds = genericSelectors.selectLinkedPanelIdsForMap(state, mapId);
     var connectedMapIds = new Set([mapId]);
@@ -9245,6 +9394,13 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
     });
     var targetPanelIds = getFeatureSelectionTargetPanelIds(selectedFeatureId, featureOwnerPanelIdsById, directlyLinkedPanelIds);
     var mapIdsToUpdate = directlyLinkedMapIds.size > 0 ? Array.from(directlyLinkedMapIds) : [mapId];
+    var shouldMirrorSelectionToDrawLayer = hoverLinkedFeature && hoverLinkedFeature.get('isReadonly') !== true && !isHoveredFeatureSyncLayer && targetPanelIds.length === 0;
+    if (shouldMirrorSelectionToDrawLayer) {
+      dispatch(layerActions.setSelectedFeatures({
+        layerId: "drawlayer-" + mapId,
+        selectedFeatureIds: selectedFeatureId ? [selectedFeatureId] : []
+      }));
+    }
     if (targetPanelIds.length > 0) {
       directlyLinkedPanelIds.forEach(function (panelId) {
         var featureIdForPanel = targetPanelIds.includes(panelId) ? selectedFeatureId : '';
@@ -9263,7 +9419,7 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
         mapPinLocation: mapPinLocation
       }));
     });
-  }, [dispatch, featureOwnerPanelIdsById, disableMapPin, hoverLinkedFeature, mapId, setSelectedFeatureIdsForPanel, srs, store]);
+  }, [dispatch, featureOwnerPanelIdsById, disableMapPin, hoverLinkedFeature, isCurrentMapDrawToolActive, mapId, setSelectedFeatureIdsForPanel, srs, store]);
   var isActiveWindowId = useSelector(function (store) {
     return uiSelectors.getIsActiveWindowId(store, mapId);
   });
@@ -9312,8 +9468,8 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
     };
   }, [view, mapId, srs, dispatch]);
   var featureProperties = React.useMemo(function () {
-    var _hoverLinkedFeature$g3;
-    return (_hoverLinkedFeature$g3 = hoverLinkedFeature == null || hoverLinkedFeature.getProperties == null ? void 0 : hoverLinkedFeature.getProperties()) != null ? _hoverLinkedFeature$g3 : {};
+    var _hoverLinkedFeature$g4;
+    return (_hoverLinkedFeature$g4 = hoverLinkedFeature == null || hoverLinkedFeature.getProperties == null ? void 0 : hoverLinkedFeature.getProperties()) != null ? _hoverLinkedFeature$g4 : {};
   }, [hoverLinkedFeature]);
   var hoverIdFromFeature = hoverLinkedFeature == null ? void 0 : hoverLinkedFeature.get('originalId');
   var hoverId = typeof hoverIdFromFeature === 'string' && hoverIdFromFeature || (typeof (featureProperties == null ? void 0 : featureProperties.originalId) === 'string' ? featureProperties.originalId : undefined);
@@ -9462,7 +9618,7 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
   }, [isSearchDialogOpen]);
   useFitAndHighlightWarningFeature({
     view: view,
-    warningDialogFeatures: warningDialogFeatures,
+    warningDialogFeatures: warningDialogFeaturesForHighlight,
     srs: srs,
     mapId: mapId
   });
@@ -9483,23 +9639,12 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
       })
     };
   }, [hoveredLinkedFeatureIds, linkedFeatureCollections]);
-  var filteredLinkedFormFeatures = React.useMemo(function () {
-    return {
-      type: 'FeatureCollection',
-      features: linkedFormFeatures.features.filter(function (feature) {
-        var _feature$properties2;
-        var featureId = feature.id !== undefined ? String(feature.id) : undefined;
-        var originalId = typeof ((_feature$properties2 = feature.properties) == null ? void 0 : _feature$properties2.originalId) === 'string' ? feature.properties.originalId : undefined;
-        return !(featureId && warningDialogFeatureKeys.has(featureId) || originalId && warningDialogFeatureKeys.has(originalId));
-      })
-    };
-  }, [linkedFormFeatures, warningDialogFeatureKeys]);
   var combinedLinkedFeatures = React.useMemo(function () {
     return {
       type: 'FeatureCollection',
-      features: [].concat(linkedFeatureCollectionsWithHover.features, filteredLinkedFormFeatures.features)
+      features: linkedFeatureCollectionsWithHover.features
     };
-  }, [linkedFeatureCollectionsWithHover, filteredLinkedFormFeatures]);
+  }, [linkedFeatureCollectionsWithHover]);
   return jsx(TimeContext.Provider, {
     value: prefetchTimespan,
     children: jsxs(OpenLayersMapView, {
@@ -9549,7 +9694,8 @@ var OlMapViewConnect = function OlMapViewConnect(_ref) {
           disableMapPin: disableMapPin,
           displayMapPin: displayMapPin,
           mapPinLocation: mapPinLocation,
-          selectLocation: mapPinChangeLocation
+          selectLocation: mapPinChangeLocation,
+          shouldHandleClick: shouldHandleMapPinClick
         })]
       }), jsxs(MapControls, {
         "data-testid": "mapControls",

package/dist/src/lib/components/LayerManager/LayerContainerRow/LayerRow/Menubutton/MenuButton.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
-interface LayerManagerButtonProps {
+interface LayerManagerMenuButtonProps {
     mapId: string;
     layerId?: string;
     isFeatureLayer?: boolean;
+    isFeatureSyncLayer?: boolean;
     onLayerDuplicate?: (payload: {
         mapId: string;
         layerId: string;
@@ -14,5 +15,5 @@ interface LayerManagerButtonProps {
     tooltipTitle?: string;
     icon?: React.ReactNode;
 }
-declare const LayerManagerMenuButton: React.FC<LayerManagerButtonProps>;
+declare const LayerManagerMenuButton: React.FC<LayerManagerMenuButtonProps>;
 export default LayerManagerMenuButton;

package/dist/src/lib/components/LayerManager/LayerContainerRow/LayerRow/Menubutton/MenuButtonConnect.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
-interface LayerManagerButtonProps {
+interface LayerManagerMenuButtonConnectProps {
     mapId: string;
     layerId?: string;
     tooltipTitle?: string;
     icon?: React.ReactNode;
 }
-declare const LayerManagerMenuButtonConnect: React.FC<LayerManagerButtonProps>;
+declare const LayerManagerMenuButtonConnect: React.FC<LayerManagerMenuButtonConnectProps>;
 export default LayerManagerMenuButtonConnect;

package/dist/src/lib/components/LayerManager/LayerContainerRow/LayerRow/SelectableFeaturesCheckbox/SelectableFeaturesCheckbox.d.ts

@@ -3,6 +3,7 @@ interface SelectableFeaturesProps {
     layerId: string;
     isSelectable: boolean;
     onToggleSelectable: () => void;
+    disabled?: boolean;
 }
 declare const SelectableFeatures: React.FC<SelectableFeaturesProps>;
 export default SelectableFeatures;

package/dist/src/lib/components/LayerManager/LayerContainerRow/LayerRow/SelectableFeaturesCheckbox/SelectableFeaturesCheckboxConnect.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 interface SelectableFeaturesCheckboxConnectProps {
     layerId: string;
+    disabled?: boolean;
 }
 declare const SelectableFeaturesCheckboxConnect: React.FC<SelectableFeaturesCheckboxConnectProps>;
 export default SelectableFeaturesCheckboxConnect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/core",
-  "version": "19.2.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.16.0",
     "@opengeoweb/layer-select": "*",
     "lodash": "^4.18.1",
     "ol": "^10.4.0",