@opengeoweb/store 20.0.1-nightly-20261015 → 20.1.0

package/dist/index.esm.js

@@ -5,7 +5,7 @@ export { LayerType } from '@opengeoweb/webmap';
 import { dateUtils, PROJECTION, defaultDelay, useDebounce } from '@opengeoweb/shared';
 import { secondsPerPxFromCanvasWidth, defaultTimeSpan, defaultSecondsPerPx, defaultAnimationDelayAtStart, defaultTimeStep, MAX_ANIMATION_STEPS, AnimationLengthMode, defaultExactSelections, withDraggedRange, roundWithTimeStep, isValidAnimationLength, isWithinAnimationStepLimit, settingRange, isAnchoredMode, resolveAnimationRange, defaultOffsetSelections, getAnimationLengthFromRange, withModeSelections, getSpeedDelay } from '@opengeoweb/time-slider';
 import { produce } from 'immer';
-import { getLastEmptyFeatureIndex, getGeoJson, moveFeature, createInterSections, defaultLayers, fetchStacCatalogRoot, stacCatalogCollectionToLayerProps, fetchStacCatalogCollections, emptyGeoJSON, defaultIntersectionStyleProperties, addSelectionTypeToGeoJSON, getFeatureCollection } from '@opengeoweb/webmap-react';
+import { getLastEmptyFeatureIndex, getGeoJson, moveFeature, createInterSections, defaultLayers, fetchStacCatalogRoot, defaultEdrStyles, normalizeEDRLabel, fetchEDRJson, stacCatalogCollectionToLayerProps, fetchStacCatalogCollections, emptyGeoJSON, defaultIntersectionStyleProperties, addSelectionTypeToGeoJSON, getFeatureCollection } from '@opengeoweb/webmap-react';
 export { defaultLayers } from '@opengeoweb/webmap-react';
 import { v4 } from 'uuid';
 import React, { useEffect, useRef, useCallback } from 'react';
@@ -1321,6 +1321,9 @@ var trimTrailingSlashes = function trimTrailingSlashes(url) {
 var getSTACServiceRootUrl = function getSTACServiceRootUrl(serviceUrl) {
   return trimTrailingSlashes(serviceUrl).replace(/\/collections\/[^/]+$/, '');
 };
+var getEDRServiceRootUrl = function getEDRServiceRootUrl(serviceUrl) {
+  return trimTrailingSlashes(serviceUrl).replace(/\/collections\/[^/]+$/, '');
+};
 var getTrailingSlashVariant = function getTrailingSlashVariant(url) {
   return url.endsWith('/') ? url.slice(0, -1) : "".concat(url, "/");
 };
@@ -1584,6 +1587,7 @@ var utils$1 = /*#__PURE__*/Object.freeze({
   filterCurrentValueFromDimensions: filterCurrentValueFromDimensions,
   filterNonTimeDimensions: filterNonTimeDimensions,
   generateFeatureId: generateFeatureId,
+  getEDRServiceRootUrl: getEDRServiceRootUrl,
   getFeatureSelectionKey: getFeatureSelectionKey,
   getSTACServiceRootUrl: getSTACServiceRootUrl,
   getSelectedFeatureIndexByIds: getSelectedFeatureIndexByIds,
@@ -3206,6 +3210,7 @@ var slice$6 = createSlice({
       draft.byId[mapId].baseLayers = [];
       draft.byId[mapId].mapLayers = [];
       draft.byId[mapId].overLayers = [];
+      draft.byId[mapId].featureLayers = [];
       draft.byId[mapId].isAutoUpdating = false;
       draft.byId[mapId].isAnimating = false;
       draft.byId[mapId].isTimeSliderVisible = true;
@@ -5215,6 +5220,15 @@ var useSyncgroupTimeState = function useSyncgroupTimeState(panelId) {
 var layerStore = function layerStore(store) {
   return store === null || store === void 0 ? void 0 : store.layers;
 };
+var getCollectionServiceRootUrl = function getCollectionServiceRootUrl(layerType, serviceUrl) {
+  if (layerType === LayerType.edrFeatureLayer) {
+    return getEDRServiceRootUrl(serviceUrl);
+  }
+  if (layerType === LayerType.stacGeoTIFFLayer) {
+    return getSTACServiceRootUrl(serviceUrl);
+  }
+  return undefined;
+};
 /**
  * Gets a layer from the layers part of the store by its Id
  *
@@ -5487,7 +5501,8 @@ var getLayerService = createSelector(getLayerById, function (layer) {
 var getLayerServiceName = createSelector(function (store) {
   return store;
 }, getLayerById, getLayerService, function (store, layer, service) {
-  var layerService = getServiceByUrl(store, service) || ((layer === null || layer === void 0 ? void 0 : layer.layerType) === LayerType.stacGeoTIFFLayer ? getServiceByUrl(store, getSTACServiceRootUrl(service)) || getServiceByUrl(store, getTrailingSlashVariant(getSTACServiceRootUrl(service))) : undefined);
+  var serviceRootUrl = getCollectionServiceRootUrl(layer === null || layer === void 0 ? void 0 : layer.layerType, service);
+  var layerService = getServiceByUrl(store, service) || (serviceRootUrl ? getServiceByUrl(store, serviceRootUrl) || getServiceByUrl(store, getTrailingSlashVariant(serviceRootUrl)) : undefined);
   return layerService !== null && layerService !== void 0 && layerService.name ? layerService === null || layerService === void 0 ? void 0 : layerService.name : '';
 }, selectorMemoizationOptions);
 /**
@@ -5745,8 +5760,9 @@ var getIsLayerMissing = createSelector(function (store) {
   if (type === LayerType.featureLayer || type === LayerType.stacGeoTIFFLayer) {
     return false;
   }
-  var layer = getLayerFromService(store, service, name);
-  return !layer || status === LayerStatus.error;
+  var serviceRootUrl = getCollectionServiceRootUrl(type, service);
+  var serviceLayer = getLayerFromService(store, service, name) || (serviceRootUrl ? getLayerFromService(store, serviceRootUrl, name) || getLayerFromService(store, getTrailingSlashVariant(serviceRootUrl), name) : undefined);
+  return !serviceLayer || status === LayerStatus.error;
 }, selectorMemoizationOptions);
 var getIsLayerSelectable = createSelector(getLayerById, function (layer) {
   return Boolean(layer === null || layer === void 0 ? void 0 : layer.isSelectable);
@@ -9957,21 +9973,59 @@ var fetchSTACLayers = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
+var fetchEDRLayers = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(serviceUrl) {
+    var _data$collections;
+    var baseUrl, data;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          baseUrl = serviceUrl.endsWith('/') ? serviceUrl.slice(0, -1) : serviceUrl;
+          _context2.n = 1;
+          return fetchEDRJson("".concat(baseUrl, "/collections"));
+        case 1:
+          data = _context2.v;
+          return _context2.a(2, ((_data$collections = data.collections) !== null && _data$collections !== void 0 ? _data$collections : []).flatMap(function (collection) {
+            var _collection$parameter;
+            return Object.entries((_collection$parameter = collection.parameter_names) !== null && _collection$parameter !== void 0 ? _collection$parameter : {}).map(function (_ref3) {
+              var _parameter$label, _ref5, _collection$path, _collection$title, _parameter$observedPr, _parameter$label2;
+              var _ref4 = _slicedToArray(_ref3, 2),
+                parameterId = _ref4[0],
+                parameter = _ref4[1];
+              return {
+                name: parameterId,
+                title: (_parameter$label = parameter.label) !== null && _parameter$label !== void 0 ? _parameter$label : parameterId,
+                leaf: true,
+                path: [].concat(_toConsumableArray((_ref5 = (_collection$path = collection.path) !== null && _collection$path !== void 0 ? _collection$path : collection.groups) !== null && _ref5 !== void 0 ? _ref5 : collection.group ? [collection.group] : []), [(_collection$title = collection.title) !== null && _collection$title !== void 0 ? _collection$title : collection.id]),
+                keywords: (_parameter$observedPr = parameter.observedProperty) !== null && _parameter$observedPr !== void 0 && _parameter$observedPr.label ? [normalizeEDRLabel(parameter.observedProperty.label, (_parameter$label2 = parameter.label) !== null && _parameter$label2 !== void 0 ? _parameter$label2 : parameterId)] : [],
+                edrCollectionId: collection.id,
+                edrParameter: parameter,
+                styles: defaultEdrStyles
+              };
+            });
+          }));
+      }
+    }, _callee2);
+  }));
+  return function fetchEDRLayers(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
 var dispatchServiceLayers = function dispatchServiceLayers(service, layers, listenerApi) {
   listenerApi.dispatch(serviceActions.serviceSetLayers(_objectSpread2(_objectSpread2({}, service), {}, {
     layers: layers
   })));
 };
 var fetchSTACService = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(service, listenerApi) {
+  var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(service, listenerApi) {
     var _yield$Promise$all, _yield$Promise$all2, root, layers;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
         case 0:
-          _context2.n = 1;
+          _context3.n = 1;
           return Promise.all([fetchStacCatalogRoot(service.serviceUrl), fetchSTACLayers(service.serviceUrl)]);
         case 1:
-          _yield$Promise$all = _context2.v;
+          _yield$Promise$all = _context3.v;
           _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
           root = _yield$Promise$all2[0];
           layers = _yield$Promise$all2[1];
@@ -9981,117 +10035,139 @@ var fetchSTACService = /*#__PURE__*/function () {
             type: 'STAC'
           }), layers, listenerApi);
         case 2:
-          return _context2.a(2);
+          return _context3.a(2);
       }
-    }, _callee2);
+    }, _callee3);
   }));
-  return function fetchSTACService(_x2, _x3) {
-    return _ref2.apply(this, arguments);
+  return function fetchSTACService(_x3, _x4) {
+    return _ref6.apply(this, arguments);
   };
 }();
 var fetchService = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(service, listenerApi) {
-    var layers, _t;
-    return _regenerator().w(function (_context3) {
-      while (1) switch (_context3.p = _context3.n) {
+  var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(service, listenerApi) {
+    var layers, _layers, _t, _t2;
+    return _regenerator().w(function (_context4) {
+      while (1) switch (_context4.p = _context4.n) {
         case 0:
-          if (!(service.type === 'STAC')) {
-            _context3.n = 2;
+          if (!(service.type === 'EDR')) {
+            _context4.n = 5;
             break;
           }
-          _context3.n = 1;
-          return fetchSTACService(service, listenerApi);
-        case 1:
-          return _context3.a(2);
+          _context4.p = 1;
+          _context4.n = 2;
+          return fetchEDRLayers(service.serviceUrl);
         case 2:
-          _context3.p = 2;
-          _context3.n = 3;
-          return queryWMSLayers(service.serviceUrl);
-        case 3:
-          layers = _context3.v;
+          layers = _context4.v;
           dispatchServiceLayers(service, layers, listenerApi);
-          _context3.n = 5;
+          _context4.n = 4;
           break;
-        case 4:
-          _context3.p = 4;
-          _t = _context3.v;
+        case 3:
+          _context4.p = 3;
+          _t = _context4.v;
           if (_t instanceof Error) {
             console.warn(_t.message);
           }
+          dispatchServiceLayers(service, [], listenerApi);
+        case 4:
+          return _context4.a(2);
         case 5:
-          return _context3.a(2);
+          if (!(service.type === 'STAC')) {
+            _context4.n = 7;
+            break;
+          }
+          _context4.n = 6;
+          return fetchSTACService(service, listenerApi);
+        case 6:
+          return _context4.a(2);
+        case 7:
+          _context4.p = 7;
+          _context4.n = 8;
+          return queryWMSLayers(service.serviceUrl);
+        case 8:
+          _layers = _context4.v;
+          dispatchServiceLayers(service, _layers, listenerApi);
+          _context4.n = 10;
+          break;
+        case 9:
+          _context4.p = 9;
+          _t2 = _context4.v;
+          if (_t2 instanceof Error) {
+            console.warn(_t2.message);
+          }
+        case 10:
+          return _context4.a(2);
       }
-    }, _callee3, null, [[2, 4]]);
+    }, _callee4, null, [[7, 9], [1, 3]]);
   }));
-  return function fetchService(_x4, _x5) {
-    return _ref3.apply(this, arguments);
+  return function fetchService(_x5, _x6) {
+    return _ref7.apply(this, arguments);
   };
 }();
 var fetchInitialServices = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(payload, listenerApi) {
-    var _t2;
-    return _regenerator().w(function (_context5) {
-      while (1) switch (_context5.p = _context5.n) {
+  var _ref8 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(payload, listenerApi) {
+    var _t3;
+    return _regenerator().w(function (_context6) {
+      while (1) switch (_context6.p = _context6.n) {
         case 0:
           if (payload !== null && payload !== void 0 && payload.services) {
-            _context5.n = 1;
+            _context6.n = 1;
             break;
           }
-          return _context5.a(2);
+          return _context6.a(2);
         case 1:
-          _context5.p = 1;
-          _context5.n = 2;
+          _context6.p = 1;
+          _context6.n = 2;
           return Promise.all(payload.services.map(/*#__PURE__*/function () {
-            var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(_ref5) {
+            var _ref0 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(_ref9) {
               var url, service;
-              return _regenerator().w(function (_context4) {
-                while (1) switch (_context4.n) {
+              return _regenerator().w(function (_context5) {
+                while (1) switch (_context5.n) {
                   case 0:
-                    url = _ref5.url, service = _objectWithoutProperties(_ref5, _excluded);
-                    return _context4.a(2, fetchService(_objectSpread2(_objectSpread2({}, service), {}, {
+                    url = _ref9.url, service = _objectWithoutProperties(_ref9, _excluded);
+                    return _context5.a(2, fetchService(_objectSpread2(_objectSpread2({}, service), {}, {
                       serviceUrl: url
                     }), listenerApi));
                 }
-              }, _callee4);
+              }, _callee5);
             }));
-            return function (_x8) {
-              return _ref6.apply(this, arguments);
+            return function (_x9) {
+              return _ref0.apply(this, arguments);
             };
           }()));
         case 2:
-          _context5.n = 4;
+          _context6.n = 4;
           break;
         case 3:
-          _context5.p = 3;
-          _t2 = _context5.v;
-          console.warn(_t2);
+          _context6.p = 3;
+          _t3 = _context6.v;
+          console.warn(_t3);
         case 4:
-          return _context5.a(2);
+          return _context6.a(2);
       }
-    }, _callee5, null, [[1, 3]]);
+    }, _callee6, null, [[1, 3]]);
   }));
-  return function fetchInitialServices(_x6, _x7) {
-    return _ref4.apply(this, arguments);
+  return function fetchInitialServices(_x7, _x8) {
+    return _ref8.apply(this, arguments);
   };
 }();
 serviceListener.startListening({
   actionCreator: serviceActions.fetchInitialServices,
   effect: function () {
-    var _effect = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(_ref7, listenerApi) {
+    var _effect = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(_ref1, listenerApi) {
       var payload;
-      return _regenerator().w(function (_context6) {
-        while (1) switch (_context6.n) {
+      return _regenerator().w(function (_context7) {
+        while (1) switch (_context7.n) {
           case 0:
-            payload = _ref7.payload;
+            payload = _ref1.payload;
             listenerApi.cancelActiveListeners();
-            _context6.n = 1;
+            _context7.n = 1;
             return fetchInitialServices(payload, listenerApi);
           case 1:
-            return _context6.a(2);
+            return _context7.a(2);
         }
-      }, _callee6);
+      }, _callee7);
     }));
-    function effect(_x9, _x0) {
+    function effect(_x0, _x1) {
       return _effect.apply(this, arguments);
     }
     return effect;

package/dist/src/store/map/layer/utils.d.ts

@@ -4,6 +4,7 @@ import type { Dimension, ReduxLayer } from '../types';
 import type { LayerState } from './types';
 export declare const trimTrailingSlashes: (url: string) => string;
 export declare const getSTACServiceRootUrl: (serviceUrl: string) => string;
+export declare const getEDRServiceRootUrl: (serviceUrl: string) => string;
 export declare const getTrailingSlashVariant: (url: string) => string;
 /**
  * Generates a unique id for a geoJSON feature. Feature ids need to be stable

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@opengeoweb/store",
-    "version": "20.0.1-nightly-20261015",
+    "version": "20.1.0",
     "description": "GeoWeb Store library for the opengeoweb project",
     "license": "Apache-2.0",
     "repository": {
@@ -20,15 +20,15 @@
         }
     },
     "dependencies": {
-        "@opengeoweb/shared": "20.0.1-nightly-20261015",
+        "@opengeoweb/shared": "20.1.0",
         "react-redux": "^9.2.0",
         "@reduxjs/toolkit": "^2.6.1",
-        "@opengeoweb/webmap-react": "20.0.1-nightly-20261015",
-        "@opengeoweb/webmap": "20.0.1-nightly-20261015",
+        "@opengeoweb/webmap-react": "20.1.0",
+        "@opengeoweb/webmap": "20.1.0",
         "immer": "^10.0.3",
         "lodash": "^4.18.1",
-        "@opengeoweb/metronome": "20.0.1-nightly-20261015",
-        "@opengeoweb/time-slider": "20.0.1-nightly-20261015",
+        "@opengeoweb/metronome": "20.1.0",
+        "@opengeoweb/time-slider": "20.1.0",
         "ol": "^10.4.0",
         "@turf/turf": "^7.2.0",
         "@types/geojson": "^7946.0.14",