@opengeoweb/layer-select 19.3.0 → 19.5.0

package/dist/index.esm.js

@@ -2511,8 +2511,12 @@ var DetectableServiceType;
   DetectableServiceType["STAC"] = "STAC";
   DetectableServiceType["WMS"] = "WMS";
 })(DetectableServiceType || (DetectableServiceType = {}));
+var stripStacCollectionsAndTrailingSlashes = function stripStacCollectionsAndTrailingSlashes(serviceUrl) {
+  return (serviceUrl != null ? serviceUrl : '').replace(/\/collections.*$/i, '').replace(/\/+$/, '');
+};
 var normalizeStacServiceUrl = function normalizeStacServiceUrl(serviceUrl) {
-  return (serviceUrl != null ? serviceUrl : '').replace(/\/collections.*$/i, '');
+  var normalizedUrl = stripStacCollectionsAndTrailingSlashes(serviceUrl);
+  return normalizedUrl ? normalizedUrl + "/" : '';
 };
 var validateServiceName = function validateServiceName(t, value, services, ownServiceName) {
   if (ownServiceName === void 0) {
@@ -2543,9 +2547,10 @@ var validateServiceUrl = function validateServiceUrl(t, value, services) {
     return t('validations-service-valid-url');
   }
   // check url existing
+  var normalizedServiceUrl = stripStacCollectionsAndTrailingSlashes(serviceUrl);
   var foundUrl = Object.keys(services).find(function (serviceId) {
     var _services$serviceId2;
-    return ((_services$serviceId2 = services[serviceId]) == null ? void 0 : _services$serviceId2.serviceUrl) === serviceUrl;
+    return stripStacCollectionsAndTrailingSlashes((_services$serviceId2 = services[serviceId]) == null ? void 0 : _services$serviceId2.serviceUrl) === normalizedServiceUrl;
   });
   if (foundUrl) {
     return t('validations-service-existing');
@@ -2592,63 +2597,95 @@ var loadWMSService = /*#__PURE__*/function () {
   };
 }();
 var detectServiceType = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(url) {
-    var root, hasStacRootShape;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.p = _context2.n) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(url) {
+    var trimmedUrl, isStacServiceUrl, _t2;
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
         case 0:
-          _context2.p = 0;
-          _context2.n = 1;
-          return fetchStacCatalogRoot(url);
+          trimmedUrl = url.trim();
+          isStacServiceUrl = /*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(candidateUrl) {
+              var root, hasStacRootShape;
+              return _regenerator().w(function (_context2) {
+                while (1) switch (_context2.p = _context2.n) {
+                  case 0:
+                    _context2.p = 0;
+                    _context2.n = 1;
+                    return fetchStacCatalogRoot(candidateUrl);
+                  case 1:
+                    root = _context2.v;
+                    hasStacRootShape = root.stac_version || root.type === 'Catalog' || Array.isArray(root.conformsTo);
+                    if (!hasStacRootShape) {
+                      _context2.n = 2;
+                      break;
+                    }
+                    return _context2.a(2, true);
+                  case 2:
+                    return _context2.a(2, Boolean(root.type === 'Collection' && root.stac_version && Array.isArray(root.links)));
+                  case 3:
+                    _context2.p = 3;
+                    _context2.v;
+                    return _context2.a(2, false);
+                }
+              }, _callee2, null, [[0, 3]]);
+            }));
+            return function isStacServiceUrl(_x4) {
+              return _ref3.apply(this, arguments);
+            };
+          }();
+          _context3.n = 1;
+          return isStacServiceUrl(trimmedUrl);
         case 1:
-          root = _context2.v;
-          hasStacRootShape = root.stac_version || root.type === 'Catalog' || Array.isArray(root.conformsTo);
-          if (!hasStacRootShape) {
-            _context2.n = 2;
+          if (!_context3.v) {
+            _context3.n = 2;
             break;
           }
-          return _context2.a(2, DetectableServiceType.STAC);
+          return _context3.a(2, DetectableServiceType.STAC);
         case 2:
-          if (!(root.type === 'Collection' && root.stac_version && Array.isArray(root.links))) {
-            _context2.n = 3;
+          _t2 = !trimmedUrl.endsWith('/');
+          if (!_t2) {
+            _context3.n = 4;
             break;
           }
-          return _context2.a(2, DetectableServiceType.STAC);
+          _context3.n = 3;
+          return isStacServiceUrl(trimmedUrl + "/");
         case 3:
-          _context2.n = 5;
-          break;
+          _t2 = _context3.v;
         case 4:
-          _context2.p = 4;
-          _context2.v;
+          if (!_t2) {
+            _context3.n = 5;
+            break;
+          }
+          return _context3.a(2, DetectableServiceType.STAC);
         case 5:
-          return _context2.a(2, DetectableServiceType.WMS);
+          return _context3.a(2, DetectableServiceType.WMS);
       }
-    }, _callee2, null, [[0, 4]]);
+    }, _callee3);
   }));
   return function detectServiceType(_x3) {
     return _ref2.apply(this, arguments);
   };
 }();
 var loadSTACService = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(serviceUrl) {
-    var _ref4, _root$title, _root$description;
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(serviceUrl) {
+    var _ref5, _root$title, _root$description;
     var _yield$Promise$all, root, collections, serviceId, layers;
-    return _regenerator().w(function (_context3) {
-      while (1) switch (_context3.n) {
+    return _regenerator().w(function (_context4) {
+      while (1) switch (_context4.n) {
         case 0:
-          _context3.n = 1;
+          _context4.n = 1;
           return Promise.all([fetchStacCatalogRoot(serviceUrl), fetchStacCatalogCollections(serviceUrl)]);
         case 1:
-          _yield$Promise$all = _context3.v;
+          _yield$Promise$all = _context4.v;
           root = _yield$Promise$all[0];
           collections = _yield$Promise$all[1];
           serviceId = serviceUrl.replace(/\/+$/, '').replace(/[^a-zA-Z0-9]/g, '_');
           layers = collections.map(stacCatalogCollectionToLayerProps);
-          return _context3.a(2, {
+          return _context4.a(2, {
             // Use URL-based ids so different STAC endpoints with identical root.id
             // values (e.g. "stac-fastapi") can coexist in the service store.
             id: serviceId,
-            name: (_ref4 = (_root$title = root.title) != null ? _root$title : root.id) != null ? _ref4 : serviceId,
+            name: (_ref5 = (_root$title = root.title) != null ? _root$title : root.id) != null ? _ref5 : serviceId,
             serviceUrl: serviceUrl,
             "abstract": (_root$description = root.description) != null ? _root$description : '',
             layers: layers,
@@ -2656,10 +2693,10 @@ var loadSTACService = /*#__PURE__*/function () {
             type: DetectableServiceType.STAC
           });
       }
-    }, _callee3);
+    }, _callee4);
   }));
-  return function loadSTACService(_x4) {
-    return _ref3.apply(this, arguments);
+  return function loadSTACService(_x5) {
+    return _ref4.apply(this, arguments);
   };
 }();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/layer-select",
-  "version": "19.3.0",
+  "version": "19.5.0",
   "description": "GeoWeb layer select library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {