@opengeoweb/soundings 19.1.1 → 19.2.0

package/dist/index.esm.js

@@ -1015,32 +1015,47 @@ var getCollectionDetails = /*#__PURE__*/function () {
     return _ref3.apply(this, arguments);
   };
 }();
-var getEdrCollectionForLocation = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(collectionId, baseUrl, instanceId, locationId, parameters, datetime, verticalRange) {
-    var url;
+var getInstanceDetails = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(collectionId, instanceId, baseUrl) {
     return _regenerator().w(function (_context4) {
       while (1) switch (_context4.n) {
+        case 0:
+          return _context4.a(2, fetch(withJsonFormat(baseUrl + "/collections/" + collectionId + "/instances/" + instanceId), {
+            headers: getHeaders()
+          }).then(handleResponse));
+      }
+    }, _callee4);
+  }));
+  return function getInstanceDetails(_x7, _x8, _x9) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+var getEdrCollectionForLocation = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(collectionId, baseUrl, instanceId, locationId, parameters, datetime, verticalRange) {
+    var url;
+    return _regenerator().w(function (_context5) {
+      while (1) switch (_context5.n) {
         case 0:
           url = new URL(baseUrl + "/collections/" + collectionId + (instanceId ? "/instances/" + instanceId : '') + "/locations/" + locationId);
           url.searchParams.append('parameter-name', parameters.join(','));
           url.searchParams.append('datetime', datetime);
           url.searchParams.append('z', verticalRange);
           url.searchParams.append('f', 'CoverageJSON');
-          return _context4.a(2, fetch(url.toString(), {
+          return _context5.a(2, fetch(url.toString(), {
             headers: getHeaders()
           }).then(handleResponse));
       }
-    }, _callee4);
+    }, _callee5);
   }));
-  return function getEdrCollectionForLocation(_x7, _x8, _x9, _x0, _x1, _x10, _x11) {
-    return _ref4.apply(this, arguments);
+  return function getEdrCollectionForLocation(_x0, _x1, _x10, _x11, _x12, _x13, _x14) {
+    return _ref5.apply(this, arguments);
   };
 }();
 var getEdrCollectionForPosition = /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(collectionId, baseUrl, instanceId, coordinates, parameters, datetime, verticalRange) {
+  var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(collectionId, baseUrl, instanceId, coordinates, parameters, datetime, verticalRange) {
     var url;
-    return _regenerator().w(function (_context5) {
-      while (1) switch (_context5.n) {
+    return _regenerator().w(function (_context6) {
+      while (1) switch (_context6.n) {
         case 0:
           url = new URL(baseUrl + "/collections/" + collectionId + (instanceId ? "/instances/" + instanceId : '') + "/position");
           url.searchParams.append('coords', "POINT(" + coordinates[0] + " " + coordinates[1] + ")");
@@ -1050,14 +1065,14 @@ var getEdrCollectionForPosition = /*#__PURE__*/function () {
             url.searchParams.append('z', verticalRange);
           }
           url.searchParams.append('f', 'CoverageJSON');
-          return _context5.a(2, fetch(url.toString(), {
+          return _context6.a(2, fetch(url.toString(), {
             headers: getHeaders()
           }).then(handleResponse));
       }
-    }, _callee5);
+    }, _callee6);
   }));
-  return function getEdrCollectionForPosition(_x12, _x13, _x14, _x15, _x16, _x17, _x18) {
-    return _ref5.apply(this, arguments);
+  return function getEdrCollectionForPosition(_x15, _x16, _x17, _x18, _x19, _x20, _x21) {
+    return _ref6.apply(this, arguments);
   };
 }();
 /**
@@ -1066,10 +1081,10 @@ var getEdrCollectionForPosition = /*#__PURE__*/function () {
  * Returns a CoverageCollection with coverages for each grid point within the radius.
  */
 var getEdrCollectionForRadius = /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(collectionId, baseUrl, instanceId, centerCoordinates, radiusKm, parameters, datetime, verticalRange) {
+  var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(collectionId, baseUrl, instanceId, centerCoordinates, radiusKm, parameters, datetime, verticalRange) {
     var url;
-    return _regenerator().w(function (_context6) {
-      while (1) switch (_context6.n) {
+    return _regenerator().w(function (_context7) {
+      while (1) switch (_context7.n) {
         case 0:
           url = new URL(baseUrl + "/collections/" + collectionId + (instanceId ? "/instances/" + instanceId : '') + "/radius");
           url.searchParams.append('coords', "POINT(" + centerCoordinates[0] + " " + centerCoordinates[1] + ")");
@@ -1082,14 +1097,14 @@ var getEdrCollectionForRadius = /*#__PURE__*/function () {
             url.searchParams.append('z', verticalRange);
           }
           url.searchParams.append('f', 'CoverageJSON');
-          return _context6.a(2, fetch(url.toString(), {
+          return _context7.a(2, fetch(url.toString(), {
             headers: getHeaders()
           }).then(handleResponse));
       }
-    }, _callee6);
+    }, _callee7);
   }));
-  return function getEdrCollectionForRadius(_x19, _x20, _x21, _x22, _x23, _x24, _x25, _x26) {
-    return _ref6.apply(this, arguments);
+  return function getEdrCollectionForRadius(_x22, _x23, _x24, _x25, _x26, _x27, _x28, _x29) {
+    return _ref7.apply(this, arguments);
   };
 }();
 
@@ -1464,7 +1479,7 @@ var constructQueryParams = function constructQueryParams(collectionId, baseUrl,
   }
   // POSITION call
   return {
-    queryKey: ['edr-soundings-for-position', collectionId, location.join(), parameters.join(), datetime, verticalRange],
+    queryKey: ['edr-soundings-for-position', collectionId, instanceId || '', location.join(), parameters.join(), datetime, verticalRange],
     queryFn: function () {
       var _queryFn2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
         var rawData, parsedData;
@@ -1669,28 +1684,39 @@ var useTimesteps = function useTimesteps(sourceSelections) {
         instanceId = _ref3.instanceId,
         url = _ref3.url;
       return {
-        queryKey: ['edr-soundings-instances', collectionId],
+        queryKey: ['edr-soundings-instance', collectionId, instanceId || ''],
         queryFn: function () {
           var _queryFn4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
-            var _data, data;
+            var _instanceData$extent, instanceData, timeExtentValues, allInstancesData, collectionData;
             return _regenerator().w(function (_context4) {
               while (1) switch (_context4.n) {
                 case 0:
                   if (!(instanceId && instanceId !== '')) {
-                    _context4.n = 2;
+                    _context4.n = 4;
                     break;
                   }
                   _context4.n = 1;
-                  return getCollectionInstances(collectionId, url);
+                  return getInstanceDetails(collectionId, instanceId, url);
                 case 1:
-                  _data = _context4.v;
-                  return _context4.a(2, _data);
+                  instanceData = _context4.v;
+                  timeExtentValues = instanceData == null || (_instanceData$extent = instanceData.extent) == null || (_instanceData$extent = _instanceData$extent.temporal) == null ? void 0 : _instanceData$extent.values;
+                  if (timeExtentValues) {
+                    _context4.n = 3;
+                    break;
+                  }
+                  _context4.n = 2;
+                  return getCollectionInstances(collectionId, url);
                 case 2:
-                  _context4.n = 3;
-                  return getCollectionDetails(collectionId, url);
+                  allInstancesData = _context4.v;
+                  return _context4.a(2, allInstancesData);
                 case 3:
-                  data = _context4.v;
-                  return _context4.a(2, data);
+                  return _context4.a(2, instanceData);
+                case 4:
+                  _context4.n = 5;
+                  return getCollectionDetails(collectionId, url);
+                case 5:
+                  collectionData = _context4.v;
+                  return _context4.a(2, collectionData);
               }
             }, _callee4);
           }));
@@ -1699,6 +1725,7 @@ var useTimesteps = function useTimesteps(sourceSelections) {
           }
           return queryFn;
         }(),
+        enabled: !referenceTimeUtils.isRelativeReferenceTime(instanceId),
         select: function select(data) {
           if (data.instances !== undefined) {
             var instance = data.instances.find(function (instance) {

package/dist/src/lib/api/edr-api/api.d.ts

@@ -1,8 +1,9 @@
 import type { Coverage, CoverageCollection, VerticalProfileDomain } from '@opengeoweb/shared';
-import type { CollectionDetails, LocationsResponseFromBE, SoundingsInstances } from './types';
+import type { CollectionDetails, LocationsResponseFromBE, SoundingsInstance, SoundingsInstances } from './types';
 export declare const getCollectionLocations: (collectionId: string, baseUrl: string) => Promise<LocationsResponseFromBE>;
 export declare const getCollectionInstances: (collectionId: string, baseUrl: string) => Promise<SoundingsInstances>;
 export declare const getCollectionDetails: (collectionId: string, baseUrl: string) => Promise<CollectionDetails>;
+export declare const getInstanceDetails: (collectionId: string, instanceId: string, baseUrl: string) => Promise<SoundingsInstance>;
 export declare const getEdrCollectionForLocation: (collectionId: string, baseUrl: string, instanceId: string | undefined, locationId: string, parameters: string[], datetime: string, verticalRange: string) => Promise<CoverageCollection<VerticalProfileDomain> | Coverage<VerticalProfileDomain>>;
 export declare const getEdrCollectionForPosition: (collectionId: string, baseUrl: string, instanceId: string | undefined, coordinates: [number, number], parameters: string[], datetime: string, verticalRange: string) => Promise<CoverageCollection<VerticalProfileDomain> | Coverage<VerticalProfileDomain>>;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/soundings",
-  "version": "19.1.1",
+  "version": "19.2.0",
   "description": "GeoWeb soundings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {