@opengeoweb/core 20.2.0 → 21.0.0-nightly-20261030

package/dist/index.esm.js

@@ -2,7 +2,7 @@ import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { FormControl, MenuItem, Grid, InputLabel, Paper, Box, Typography, CircularProgress, List, ListSubheader, ListItemButton, ListItemText, DialogContentText, TextField, InputAdornment, Button, useTheme, Tooltip, ListItem, ListItemIcon, Checkbox, Popper, Fade, styled, LinearProgress, Autocomplete, Switch, Select } from '@mui/material';
 import React, { useMemo, useState, useCallback, useEffect, useContext } from 'react';
 import { safelyInitI18nForTestsAndStories, sharedTranslations, SHARED_NAMESPACE, TooltipSelect, CustomIconButton, CustomDialog, CustomTooltip, ToggleMenu, AlertIcon, useScrollingInIsolation, sliderHeaderStyle, CustomSlider, SearchField, SearchHighlight, tooltipContainerStyles, renderCounter, AlertBanner, CustomAccordion, PROJECTION, calculateStartSize, useWheelStopPropagation, ToolContainerDraggable, useDebounce, dateUtils, sessionStorageProvider, usePrevious } from '@opengeoweb/shared';
-import { webmapUtils, queryWMSLayersTree, invalidateWMSGetCapabilities, LayerType, WMJSDimension, WMDefaultStyleName, queryWMSServiceInfo, queryWMSLayers, getWMSServiceId, handleDateUtilsISOString, generateLayerId, getWMLayerById, getMapDimURL, WMLayer } from '@opengeoweb/webmap';
+import { webmapUtils, queryWMSLayers, invalidateWMSGetCapabilities, LayerType, queryWMSServiceInfo, WMJSDimension, WMDefaultStyleName, getWMSServiceId, handleDateUtilsISOString, generateLayerId, getWMLayerById, getMapDimURL, WMLayer } from '@opengeoweb/webmap';
 import _, { isEqual, isArray, range, zip, throttle } from 'lodash';
 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';
@@ -39,7 +39,6 @@ var en = {
 	feature_info_title: "Click on the map for info.",
 	feature_info_no_layers: "No layers added to the map.",
 	feature_info_no_getfeatureinfo: "GetFeatureInfo is not supported.",
-	"add-layer-popup-title": "Load WMS layer(s)",
 	"add-layer-popup-service-url": "Service URL",
 	"add-layer-popup-available-services": "Available services",
 	"add-layer-popup-available-layers": "Available layers for {{serviceName}}",
@@ -137,7 +136,6 @@ var fi = {
 	feature_info_title: "Napsauta karttaa nähdäksesi lisätietoja.",
 	feature_info_no_layers: "Karttatasoja ei lisättynä kartalle",
 	feature_info_no_getfeatureinfo: "GetFeatureInfoa ei tueta",
-	"add-layer-popup-title": "Lataa WMS karttataso(t)",
 	"add-layer-popup-service-url": "Palvelun URL",
 	"add-layer-popup-available-services": "Käytettävissä olevat palvelut",
 	"add-layer-popup-available-layers": "Palvelusta {{serviceName}} saatavilla olevat karttatasot",
@@ -228,7 +226,6 @@ var no = {
 	feature_info_title: "Klikk på kartet for å få mer informasjon.",
 	feature_info_no_layers: "Ingen lag lagt til i kartet.",
 	feature_info_no_getfeatureinfo: "GetFeatureInfo støttes ikke",
-	"add-layer-popup-title": "Last inn WMS-lag",
 	"add-layer-popup-service-url": "Tjeneste-URL",
 	"add-layer-popup-available-services": "Tilgjengelige tjenester",
 	"add-layer-popup-available-layers": "Tilgjengelige tjenester for {{serviceName}}",
@@ -319,7 +316,6 @@ var nl = {
 	feature_info_title: "Klik op de kaart voor informatie.",
 	feature_info_no_layers: "Geen lagen toegevoegd op de kaart.",
 	feature_info_no_getfeatureinfo: "GetFeatureInfo wordt niet ondersteund",
-	"add-layer-popup-title": "Laad WMS lagen",
 	"add-layer-popup-service-url": "Service-URL",
 	"add-layer-popup-available-services": "Beschikbare services",
 	"add-layer-popup-available-layers": "Beschikbare lagen voor {{serviceName}}",
@@ -1030,29 +1026,21 @@ var WMSLayerTreeHeader = function WMSLayerTreeHeader(_ref) {
 };
 
 var WMSLayerTree = function WMSLayerTree(_ref) {
-  var _layerTree$children;
   var service = _ref.service,
     onClickLayer = _ref.onClickLayer,
     highlightedLayers = _ref.highlightedLayers;
   var _useCoreTranslation = useCoreTranslation(),
     t = _useCoreTranslation.t;
-  var initialTree = {
-    name: 'loading wms getcapabilities',
-    leaf: true,
-    path: [],
-    title: '',
-    children: []
-  };
   var _React$useState = React.useState([]),
     processedOK = _React$useState[0],
     setProcessedOK = _React$useState[1];
-  var handleInternalSelect = function handleInternalSelect(layerName) {
-    onClickLayer(service.url, layerName);
+  var handleInternalSelect = function handleInternalSelect(layerName, ogctype) {
+    onClickLayer(service.url, layerName, ogctype);
     setProcessedOK([].concat(processedOK, [layerName]));
   };
-  var _React$useState2 = React.useState(initialTree),
-    layerTree = _React$useState2[0],
-    setLayerTree = _React$useState2[1];
+  var _React$useState2 = React.useState([]),
+    layers = _React$useState2[0],
+    setLayers = _React$useState2[1];
   var _React$useState3 = React.useState(false),
     isLoading = _React$useState3[0],
     setIsLoading = _React$useState3[1];
@@ -1074,14 +1062,14 @@ var WMSLayerTree = function WMSLayerTree(_ref) {
               _context.n = 1;
               return invalidateWMSGetCapabilities(service.url);
             case 1:
-              queryWMSLayersTree(service.url).then(function (layerTreeFromPromise) {
+              queryWMSLayers(service.url).then(function (layersResult) {
                 if (isMounted) {
-                  setLayerTree(layerTreeFromPromise);
+                  setLayers(layersResult);
                   setIsLoading(false);
                 }
-              })["catch"](function (error) {
+              })["catch"](function () {
                 if (isMounted) {
-                  setLayerTree(error.toString());
+                  setLayers([]);
                   setIsLoading(false);
                 }
               });
@@ -1104,7 +1092,7 @@ var WMSLayerTree = function WMSLayerTree(_ref) {
     height: 200,
     overflow: 'auto'
   };
-  if (!((_layerTree$children = layerTree.children) != null && _layerTree$children.length) && !isLoading) {
+  if (!(layers != null && layers.length) && !isLoading) {
     return jsxs(Fragment, {
       children: [jsx(WMSLayerTreeHeader, {
         serviceName: service.name
@@ -1124,22 +1112,9 @@ var WMSLayerTree = function WMSLayerTree(_ref) {
       })]
     });
   }
-  // Base case where there exists at least one layer
-  // TODO: find a better way of doing this, without using prototype
-  var _flatten = function flatten(children, parent) {
-    return (
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-      Array.prototype.concat.apply((children || []).map(function (treeElem) {
-        return Object.assign({}, treeElem, {
-          parent: parent || null
-        });
-      }), (children || []).map(function (treeElem) {
-        return _flatten(treeElem.children || [], treeElem.title);
-      }))
-    );
-  };
-  var flattenedLayerTree = _flatten(layerTree.children, []);
-  var layerMap = _.groupBy(flattenedLayerTree, 'parent');
+  var layerMap = _.groupBy(layers, function (layer) {
+    return layer.path.length > 1 ? layer.path[layer.path.length - 1] : '';
+  });
   // Check if a layer of the same name and service is in an array
   var layerExists = function layerExists(targetLayer, layers) {
     return layers.filter(function (layerInMap) {
@@ -1186,7 +1161,7 @@ var WMSLayerTree = function WMSLayerTree(_ref) {
               return layer.leaf ? jsx(ListItemButton, {
                 "data-testid": "selectableLayer",
                 onClick: function onClick() {
-                  return handleInternalSelect(layer.name);
+                  return handleInternalSelect(layer.name, layer.ogctype);
                 },
                 selected: processedOK.includes(layer.name) || layerExists(layer, highlightedLayers),
                 children: jsx(ListItemText, {
@@ -1204,7 +1179,7 @@ var WMSLayerTree = function WMSLayerTree(_ref) {
 
 var connectRedux$2 = connect(function (store, props) {
   return {
-    loadedLayers: mapSelectors.getMapLayers(store, props.mapId)
+    loadedLayers: props.layerType === LayerType.baseLayer ? layerSelectors.getAvailableBaseLayersForMap(store, props.mapId) : mapSelectors.getMapLayers(store, props.mapId)
   };
 }, {
   addLayer: layerActions.addLayer,
@@ -1234,17 +1209,25 @@ var ConnectedTree = function ConnectedTree(_ref) {
       origin: layerTypes.LayerActionOrigin.wmsLoader
     });
   };
-  var addBaseLayer = function addBaseLayer(serviceURL, layerName) {
-    var newBaseLayer = {
+  var addBaseLayer = function addBaseLayer(serviceURL, layerName, type) {
+    var existingBaseLayer = loadedLayers == null ? void 0 : loadedLayers.find(function (layer) {
+      return layer.service === serviceURL && layer.name === layerName;
+    });
+    var newBaseLayer = existingBaseLayer != null ? existingBaseLayer : Object.assign({
       service: serviceURL,
-      name: layerName,
+      name: layerName
+    }, type === 'WMTS' ? {
+      type: 'wmts'
+    } : {}, {
       id: webmapUtils.generateLayerId(),
       layerType: LayerType.baseLayer,
       mapId: mapId
-    };
-    addAvailableBaseLayer({
-      layer: newBaseLayer
     });
+    if (!existingBaseLayer) {
+      addAvailableBaseLayer({
+        layer: newBaseLayer
+      });
+    }
     setBaseLayers({
       mapId: mapId,
       layers: [newBaseLayer],
@@ -1253,9 +1236,9 @@ var ConnectedTree = function ConnectedTree(_ref) {
   };
   return jsx(WMSLayerTree, {
     highlightedLayers: loadedLayers,
-    onClickLayer: function onClickLayer(serviceURL, layerName) {
+    onClickLayer: function onClickLayer(serviceURL, layerName, type) {
       if (layerType === LayerType.baseLayer) {
-        addBaseLayer(serviceURL, layerName);
+        addBaseLayer(serviceURL, layerName, type);
       } else {
         addMapLayer(serviceURL, layerName);
       }
@@ -1376,11 +1359,15 @@ var AddLayersPopup = function AddLayersPopup(_ref) {
       setLoading(false);
       // Check if valid URL was passed
     } else if (validateServiceUrl(serviceURL)) {
-      // Check if service is WMS server
-      queryWMSLayersTree(serviceURL).then(function (layerTreeFromPromise) {
+      // Check if service is WMS or WMTS server
+      queryWMSServiceInfo(serviceURL).then(function (service) {
+        var _capabilities$Capabil, _rootLayer$Title, _rootLayer$Name;
         // Shorten URL as a naming backup
         var shortenedURL = serviceURL.substring(serviceURL.indexOf('//') + 2, serviceURL.indexOf('?'));
-        handleAddToList(layerTreeFromPromise.title || layerTreeFromPromise.name || shortenedURL);
+        var capabilities = service.getCapabilitiesJson;
+        var rootLayer = (_capabilities$Capabil = capabilities.Capability) == null ? void 0 : _capabilities$Capabil.Layer;
+        var serviceName = rootLayer ? ((_rootLayer$Title = rootLayer.Title) == null ? void 0 : _rootLayer$Title.value) || ((_rootLayer$Name = rootLayer.Name) == null ? void 0 : _rootLayer$Name.value) || shortenedURL : service.title || shortenedURL;
+        handleAddToList(serviceName);
         setUrlError('');
         setLoading(false);
       })["catch"](function () {
@@ -1419,7 +1406,7 @@ var AddLayersPopup = function AddLayersPopup(_ref) {
       return handleClose == null ? void 0 : handleClose();
     },
     open: open,
-    title: t('add-layer-popup-title'),
+    title: t('layermanager-baselayers-tooltip'),
     children: jsxs(Fragment, {
       children: [jsx(DialogContentText, {
         children: t('wms-loader-description')

package/dist/src/lib/components/LayerManager/AddLayersPopup/WMSLayerTree/WMSLayerTree.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
 import type { layerTypes, serviceTypes } from '@opengeoweb/store';
+import type { OGCTYPE } from '@opengeoweb/webmap';
 interface WMSLayerTreeProps {
     service: serviceTypes.InitialService;
-    onClickLayer: (serviceURL: string, layerName: string) => void;
+    onClickLayer: (serviceURL: string, layerName: string, ogctype?: OGCTYPE) => void;
     highlightedLayers: layerTypes.Layer[];
 }
 declare const WMSLayerTree: React.FC<WMSLayerTreeProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opengeoweb/core",
-    "version": "20.2.0",
+    "version": "21.0.0-nightly-20261030",
     "description": "GeoWeb Core library for the opengeoweb project",
     "license": "Apache-2.0",
     "repository": {
@@ -20,28 +20,28 @@
         }
     },
     "dependencies": {
-        "@opengeoweb/shared": "20.2.0",
+        "@opengeoweb/shared": "21.0.0-nightly-20261030",
         "react-redux": "^9.2.0",
-        "@opengeoweb/store": "20.2.0",
-        "@opengeoweb/time-slider": "20.2.0",
+        "@opengeoweb/store": "21.0.0-nightly-20261030",
+        "@opengeoweb/time-slider": "21.0.0-nightly-20261030",
         "@reduxjs/toolkit": "^2.6.1",
-        "@opengeoweb/webmap-react": "20.2.0",
-        "@opengeoweb/webmap": "20.2.0",
-        "@opengeoweb/theme": "20.2.0",
-        "@opengeoweb/layer-select": "20.2.0",
+        "@opengeoweb/webmap-react": "21.0.0-nightly-20261030",
+        "@opengeoweb/webmap": "21.0.0-nightly-20261030",
+        "@opengeoweb/theme": "21.0.0-nightly-20261030",
+        "@opengeoweb/layer-select": "21.0.0-nightly-20261030",
         "lodash": "^4.18.1",
         "ol": "^10.4.0",
         "react-sortablejs": "^6.1.4",
         "sortablejs": "^1.15.1",
         "@mui/system": "^9.0.1",
-        "@opengeoweb/snackbar": "20.2.0",
+        "@opengeoweb/snackbar": "21.0.0-nightly-20261030",
         "react-draggable": "^4.4.6",
         "i18next": "^25.0.1",
         "react-i18next": "^15.1.1",
         "dompurify": "^3.4.13",
         "@mui/material": "^9.0.1",
         "@tanstack/react-query": "^5.85.5",
-        "@opengeoweb/api": "20.2.0",
+        "@opengeoweb/api": "21.0.0-nightly-20261030",
         "@types/geojson": "^7946.0.14",
         "@turf/turf": "^7.2.0",
         "proj4": "^2.15.0",