@opengeoweb/layer-select 9.34.0 → 9.35.1-spike-oltanstack.0

package/index.esm.js

@@ -12,7 +12,7 @@ import 'i18next';
 import { useTranslation } from 'react-i18next';
 import { FixedSizeList } from 'react-window';
 import { getDimensionsList, LayerInfoButton } from '@opengeoweb/webmap-react';
-import { webmapUtils, LayerType, WMGetServiceFromStore, getCapabilities, clearImageCacheForAllMaps } from '@opengeoweb/webmap';
+import { webmapUtils, LayerType, getWMSServiceId, queryWMSServiceInfo, queryWMSLayers, invalidateWMSGetCapabilities, clearImageCacheForAllMaps } from '@opengeoweb/webmap';
 import { snackbarTypes, snackbarActions } from '@opengeoweb/snackbar';
 import { ReactHookFormProvider, defaultFormOptions, ReactHookFormTextField } from '@opengeoweb/form-fields';
 import { useFormContext } from 'react-hook-form';
@@ -2353,20 +2353,30 @@ var loadWMSService = /*#__PURE__*/function () {
           if (forceReload === void 0) {
             forceReload = false;
           }
-          _context.next = 3;
-          return getCapabilities.getLayersFlattenedFromService(serviceUrl, forceReload);
-        case 3:
+          if (!forceReload) {
+            _context.next = 4;
+            break;
+          }
+          _context.next = 4;
+          return invalidateWMSGetCapabilities(serviceUrl);
+        case 4:
+          _context.next = 6;
+          return queryWMSLayers(serviceUrl);
+        case 6:
           layers = _context.sent;
-          service = WMGetServiceFromStore(serviceUrl);
+          _context.next = 9;
+          return queryWMSServiceInfo(serviceUrl);
+        case 9:
+          service = _context.sent;
           return _context.abrupt("return", {
-            id: service.id,
+            id: service.id || getWMSServiceId(serviceUrl),
             name: service.title,
             serviceUrl: serviceUrl,
             "abstract": service["abstract"],
             layers: layers,
             scope: 'user'
           });
-        case 6:
+        case 11:
         case "end":
           return _context.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/layer-select",
-  "version": "9.34.0",
+  "version": "9.35.1-spike-oltanstack.0",
   "description": "GeoWeb layer select library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {