@opengeoweb/soundings 12.7.0 → 12.8.0

package/index.esm.js

@@ -1670,20 +1670,22 @@ const getCollectionLocations = (collectionId, baseUrl) => fetch(`${baseUrl}/coll
 const getCollectionInstances = (collectionId, baseUrl) => fetch(`${baseUrl}/collections/${collectionId}/instances`, {
   headers: getHeaders()
 }).then(handleResponse);
-const getEdrCollectionForLocation = (collectionId, baseUrl, instanceId, locationId, parameters, datetime) => {
+const getEdrCollectionForLocation = (collectionId, baseUrl, instanceId, locationId, parameters, datetime, verticalRange) => {
   const 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 fetch(url.toString(), {
     headers: getHeaders()
   }).then(handleResponse);
 };
-const getEdrCollectionForPosition = (collectionId, baseUrl, instanceId, coordinates, parameters, datetime) => {
+const getEdrCollectionForPosition = (collectionId, baseUrl, instanceId, coordinates, parameters, datetime, verticalRange) => {
   const url = new URL(`${baseUrl}/collections/${collectionId}${instanceId ? `/instances/${instanceId}` : ''}/position`);
   url.searchParams.append('coords', `POINT(${coordinates[0]} ${coordinates[1]})`);
   url.searchParams.append('parameter-name', parameters.join(','));
   url.searchParams.append('datetime', datetime);
+  url.searchParams.append('z', verticalRange);
   url.searchParams.append('f', 'CoverageJSON');
   return fetch(url.toString(), {
     headers: getHeaders()
@@ -1893,27 +1895,29 @@ const getTimestepsFromInstance = instance => {
   if (!timeExtentValues) {
     return [];
   }
-  try {
-    // parse the time extent, if needed
-    if (timeExtentValues.length === 1) {
-      const timeExtent = timeExtentValues[0];
-      // duration with repeats
-      if (timeExtent.match(/^R\d+\/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z\/\S+$/)) {
-        return parseDurationWithRepeats(timeExtent);
+  const allParsedTimesteps = timeExtentValues.reduce((parsedSteps, currentValue) => {
+    try {
+      // Try to parse EDR time extent value in different possible formats
+      // R<repeats>/<start>/P<period>
+      if (currentValue.match(/^R\d+\/.*\/P.*$/)) {
+        return [...parsedSteps, ...parseDurationWithRepeats(currentValue)];
       }
-      // format without repeats
-      const parseObject = new ParseISOTimeRangeDuration(timeExtent);
-      const timeValues = range(parseObject.getTimeSteps()).map(timestep => parseObject.getDateAtTimeStep(timestep).toISOString());
-      return timeValues;
+      // <start>/<end>[/P<period>]
+      if (currentValue.match(/.*\/.*P?.*/)) {
+        const parseObject = new ParseISOTimeRangeDuration(currentValue);
+        const timeValues = range(parseObject.getTimeSteps()).map(timestep => parseObject.getDateAtTimeStep(timestep).toISOString());
+        return [...parsedSteps, ...timeValues];
+      }
+      // individual datetime string
+      const isoFormattedValue = new Date(currentValue).toISOString();
+      return [...parsedSteps, isoFormattedValue];
+    } catch (error) {
+      console.warn(error);
+      // skip unsupported format
+      return [...parsedSteps];
     }
-    // If more than one value, assume time extent is given as individual timesteps.
-    // Pass through toISOString to ensure consistent timestamp format.
-    const isoFormattedValues = timeExtentValues.map(value => new Date(value).toISOString());
-    return isoFormattedValues;
-  } catch (error) {
-    console.warn(error);
-  }
-  return [];
+  }, []);
+  return allParsedTimesteps;
 };
 
 /* *
@@ -1943,19 +1947,19 @@ const sortSoundingFeatures = data => {
     return featureB.properties.pressure - featureA.properties.pressure;
   });
 };
-const constructQueryParams = (collectionId, baseUrl, instanceId, location, datetime, parameterMappings) => {
+const constructQueryParams = (collectionId, baseUrl, instanceId, location, datetime, parameterMappings, verticalRange) => {
   const parameters = getParameterMappings(parameterMappings);
   if (typeof location === 'string') {
     // LOCATION call
     return {
-      queryKey: ['edr-soundings-for-location', collectionId, instanceId || '', location, parameters.join(), datetime],
+      queryKey: ['edr-soundings-for-location', collectionId, instanceId || '', location, parameters.join(), datetime, verticalRange],
       queryFn: async () => {
         // No collection, location or time selected, don't do EDR call but return empty array
         if (collectionId === undefined || location === '' || datetime === '') {
           return [];
         }
         try {
-          const rawData = await getEdrCollectionForLocation(collectionId, baseUrl, instanceId, location, parameters, datetime);
+          const rawData = await getEdrCollectionForLocation(collectionId, baseUrl, instanceId, location, parameters, datetime, verticalRange);
           const parsedData = parseCoverageCollection(rawData, parameterMappings);
           return sortSoundingFeatures(parsedData);
         } catch (err) {
@@ -1966,14 +1970,14 @@ const constructQueryParams = (collectionId, baseUrl, instanceId, location, datet
   }
   // POSITION call
   return {
-    queryKey: ['edr-soundings-for-position', collectionId, location.join(), parameters.join(), datetime],
+    queryKey: ['edr-soundings-for-position', collectionId, location.join(), parameters.join(), datetime, verticalRange],
     queryFn: async () => {
       // No collection, position or time selected, don't do EDR call but return empty array
       if (collectionId === undefined || location === undefined || datetime === '') {
         return [];
       }
       try {
-        const rawData = await getEdrCollectionForPosition(collectionId, baseUrl, instanceId, location, parameters, datetime);
+        const rawData = await getEdrCollectionForPosition(collectionId, baseUrl, instanceId, location, parameters, datetime, verticalRange);
         const parsedData = parseCoverageCollection(rawData, parameterMappings);
         return sortSoundingFeatures(parsedData);
       } catch (err) {
@@ -2008,13 +2012,14 @@ const useMultipleSources = (sources, locations, datetime) => {
       collectionId,
       url,
       instanceId,
-      parameterMappings
+      parameterMappings,
+      verticalRange
     }, index) => {
       // If acceptance time logic is needed, it could come here.
       const dateToUse = datetime &&
       // Only use selected time if exact match if found
       timesteps[index].includes(new Date(datetime).toISOString()) ? datetime : '';
-      const queryParams = constructQueryParams(collectionId, url, instanceId, locations[collectionId] || '', dateToUse || '', parameterMappings || defaultParameterMappings);
+      const queryParams = constructQueryParams(collectionId, url, instanceId, locations[collectionId] || '', dateToUse || '', parameterMappings || defaultParameterMappings, verticalRange || '');
       return queryParams;
     });
   }, [datetime, locations, sources, timesteps]);
@@ -2367,6 +2372,7 @@ const getSelectedSources = createSelector(getSoundingsStore, store => {
         collectionId: key,
         url: value.url,
         instanceId: value.instanceId,
+        verticalRange: value.verticalRange,
         parameterMappings: value.parameterMappings
       });
     }
@@ -2643,6 +2649,26 @@ const SoundingsConnect = ({
   });
 };
 
+const extractVerticalRange = (collection, selectedInstanceId) => {
+  const instance = collection.instances.find(instance => instance.id === selectedInstanceId);
+  const interval = instance?.extent?.vertical?.interval;
+  if (interval) {
+    // Fallback for FMI server while it sends a string array instead of string[][] as specified in documentation
+    if (typeof interval[0] === 'string') {
+      const verticalDims = interval.toSorted((a, b) => a.localeCompare(b, undefined, {
+        numeric: true
+      })) ?? [];
+      return verticalDims.join('/');
+    }
+    const firstEl = interval[0][0];
+    const lastEl = interval[interval.length - 1][1];
+    const verticalDims = [firstEl, lastEl].toSorted((a, b) => a.localeCompare(b, undefined, {
+      numeric: true
+    })) ?? [];
+    return verticalDims.join('/');
+  }
+  return '';
+};
 const SoundingsSourceMenu = ({
   soundingsCollections,
   isOpen = false,
@@ -2705,11 +2731,15 @@ const SoundingsSourceMenu = ({
             },
             children: jsx(Checkbox, {
               checked: !!isChecked,
-              onChange: event => updateCollection(collection.id, {
-                url,
-                isChecked: event.target.checked,
-                instanceId: selectedInstanceId
-              }),
+              onChange: event => {
+                const verticalRange = selectedInstanceId !== undefined ? extractVerticalRange(collection, selectedInstanceId) : '';
+                updateCollection(collection.id, {
+                  url,
+                  isChecked: event.target.checked,
+                  instanceId: selectedInstanceId,
+                  verticalRange
+                });
+              },
               disableRipple: true
             })
           }), jsxs(StyledSelect, {
@@ -2719,10 +2749,15 @@ const SoundingsSourceMenu = ({
             },
             skipLocalStyling: false,
             value: selectedInstanceId || t('noInstancesAvailable'),
-            onChange: event => updateCollection(collection.id, {
-              url,
-              instanceId: event.target.value
-            }),
+            onChange: event => {
+              const instanceId = event.target.value;
+              const verticalRange = extractVerticalRange(collection, instanceId);
+              updateCollection(collection.id, {
+                url,
+                instanceId,
+                verticalRange
+              });
+            },
             renderValue: value => jsx(Box, {
               sx: {
                 textOverflow: 'ellipsis',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/soundings",
-  "version": "12.7.0",
+  "version": "12.8.0",
   "description": "GeoWeb soundings library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,25 +8,26 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/api": "12.7.0",
+    "@opengeoweb/api": "12.8.0",
     "@tanstack/react-query": "^5.69.2",
     "react": "^18.3.1",
     "d3": "^7.9.0",
     "react-i18next": "^15.1.1",
     "i18next": "^25.0.1",
-    "@opengeoweb/shared": "12.7.0",
+    "@opengeoweb/shared": "12.8.0",
     "@mui/material": "^7.0.1",
-    "@opengeoweb/store": "12.7.0",
+    "@opengeoweb/store": "12.8.0",
     "react-redux": "^9.2.0",
-    "@opengeoweb/theme": "12.7.0",
+    "@opengeoweb/theme": "12.8.0",
     "@reduxjs/toolkit": "^2.6.1",
-    "@opengeoweb/timeslider": "12.7.0",
+    "@opengeoweb/timeslider": "12.8.0",
     "react-window": "^1.8.10",
-    "@opengeoweb/webmap": "12.7.0",
-    "lodash": "^4.17.21"
+    "@opengeoweb/webmap": "12.8.0",
+    "lodash": "^4.17.21",
+    "@types/geojson": "^7946.0.14"
   },
   "module": "./index.esm.js",
   "type": "module",
   "main": "./index.esm.js",
-  "types": "./index.esm.d.ts"
+  "types": "./index.d.ts"
 }

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

@@ -2,5 +2,5 @@ import { CoverageCollection } from '@opengeoweb/shared';
 import { LocationsResponseFromBE, 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 getEdrCollectionForLocation: (collectionId: string, baseUrl: string, instanceId: string | undefined, locationId: string, parameters: string[], datetime: string) => Promise<CoverageCollection>;
-export declare const getEdrCollectionForPosition: (collectionId: string, baseUrl: string, instanceId: string | undefined, coordinates: [number, number], parameters: string[], datetime: string) => Promise<CoverageCollection>;
+export declare const getEdrCollectionForLocation: (collectionId: string, baseUrl: string, instanceId: string | undefined, locationId: string, parameters: string[], datetime: string, verticalRange: string) => Promise<CoverageCollection>;
+export declare const getEdrCollectionForPosition: (collectionId: string, baseUrl: string, instanceId: string | undefined, coordinates: [number, number], parameters: string[], datetime: string, verticalRange: string) => Promise<CoverageCollection>;

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

@@ -3,6 +3,7 @@ import { SoundingFeature } from './types';
 import { SourceType } from '../../store/types';
 import { SoundingsCollectionsWithInstances } from '../../components/Soundings/types';
 import { ServiceWithLocations } from '../../components/MenuBar/LocationsMenu';
+export declare const sortSoundingFeatures: (data: SoundingFeature[]) => SoundingFeature[];
 type Coordinates = [number, number];
 export declare const defaultParameterMappings: {
     temperature: string;

package/src/lib/store/types.d.ts

@@ -2,6 +2,7 @@ export interface SourceType {
     collectionId: string;
     url: string;
     instanceId?: string;
+    verticalRange?: string;
     parameterMappings?: Record<string, string>;
 }
 export interface UpdateSourcePayload {
@@ -12,6 +13,7 @@ export interface SourceSelection {
     url: string;
     instanceId?: string;
     isChecked?: boolean;
+    verticalRange?: string;
     parameterMappings?: Record<string, string>;
 }
 export interface UpdateLocationPayload {