@opengeoweb/time-series 14.0.1 → 14.1.0

package/index.esm.js

@@ -42,6 +42,9 @@ var en = {
 	"timeseries-show": "Show",
 	"timeseries-hide": "Hide",
 	"timeseries-collection": "Collection",
+	"timeseries-collection-id": "Collection ID",
+	"timeseries-collection-title": "Collection title",
+	"timeseries-collection-description": "Collection description",
 	"timeseries-parameter": "Parameter",
 	"timeseries-parameter-info": "Timeseries parameter info",
 	"timeseries-style": "Style",
@@ -371,6 +374,9 @@ var nl = {
 	"timeseries-show": "Tonen",
 	"timeseries-hide": "Verbergen",
 	"timeseries-collection": "Collectie",
+	"timeseries-collection-id": "Collectie ID",
+	"timeseries-collection-title": "Collectie titel",
+	"timeseries-collection-description": "Collectie beschrijving",
 	"timeseries-parameter": "Parameter",
 	"timeseries-parameter-info": "Tijdreeksen parameter info",
 	"timeseries-style": "Stijl",
@@ -1009,15 +1015,20 @@ var constructParameterObject = function constructParameterObject(serviceId, coll
   });
 };
 var getCollectionDetails = function getCollectionDetails(service, collection, instances) {
-  var _collection$extent2;
+  var _collection$extent$cu, _collection$extent2, _collection$data_quer, _collection$extent3;
   return Object.assign({
     serviceId: service.id,
     serviceName: service.name || service.id,
-    collectionId: collection.id,
+    collectionId: collection.id
+  }, collection.title !== undefined ? {
+    collectionTitle: collection.title
+  } : {}, collection.description !== undefined ? {
+    collectionDescription: collection.description
+  } : {}, {
     parameters: constructParameterObject(service.id, collection.id, collection.parameter_names),
-    customDimensions: ((_collection$extent2 = collection.extent) == null ? void 0 : _collection$extent2.custom) || [],
-    dataQueries: collection.data_queries || {},
-    extent: collection.extent || {}
+    customDimensions: (_collection$extent$cu = (_collection$extent2 = collection.extent) == null ? void 0 : _collection$extent2.custom) != null ? _collection$extent$cu : [],
+    dataQueries: (_collection$data_quer = collection.data_queries) != null ? _collection$data_quer : {},
+    extent: (_collection$extent3 = collection.extent) != null ? _collection$extent3 : {}
   }, {});
 };
 var getServiceCollectionDetails = function getServiceCollectionDetails(service, collections) {
@@ -1028,9 +1039,9 @@ var getServiceCollectionDetails = function getServiceCollectionDetails(service,
   }
   // Only use parameters from collections that support /locations or /position
   for (var _iterator = _createForOfIteratorHelperLoose(collections), _step; !(_step = _iterator()).done;) {
-    var _collection$data_quer, _collection$data_quer2;
+    var _collection$data_quer2, _collection$data_quer3;
     var collection = _step.value;
-    if ((_collection$data_quer = collection.data_queries) != null && _collection$data_quer.locations || (_collection$data_quer2 = collection.data_queries) != null && _collection$data_quer2.position) {
+    if ((_collection$data_quer2 = collection.data_queries) != null && _collection$data_quer2.locations || (_collection$data_quer3 = collection.data_queries) != null && _collection$data_quer3.position) {
       collectionsParameters.push(getCollectionDetails(service, collection));
     }
   }
@@ -1063,15 +1074,16 @@ var clipEdrInterval = function clipEdrInterval(interval, maxHoursBefore,
 maxHoursAfter,
 // 10 days to the future
 date) {
+  var _dateUtils$isoStringT, _dateUtils$isoStringT2;
   if (date === void 0) {
     date = Date.now();
   }
   var startTimeFromEdr = (interval == null ? void 0 : interval.length) && interval[0];
   var endTimeFromEdr = (interval == null ? void 0 : interval.length) && interval[1];
-  var startDate = (dateUtils.isoStringToDate(String(startTimeFromEdr), false) || dateUtils.getNowUtc()).getTime();
-  var endDate = (dateUtils.isoStringToDate(String(endTimeFromEdr), false) || dateUtils.getNowUtc()).getTime();
-  var clippedStartDate = new Date(Math.max(startDate || date, date - maxHoursBefore * HOUR_IN_MILLISECONDS));
-  var clippedEndDate = new Date(Math.min(endDate || date, date + maxHoursAfter * HOUR_IN_MILLISECONDS));
+  var startDate = ((_dateUtils$isoStringT = dateUtils.isoStringToDate(String(startTimeFromEdr), false)) != null ? _dateUtils$isoStringT : dateUtils.getNowUtc()).getTime();
+  var endDate = ((_dateUtils$isoStringT2 = dateUtils.isoStringToDate(String(endTimeFromEdr), false)) != null ? _dateUtils$isoStringT2 : dateUtils.getNowUtc()).getTime();
+  var clippedStartDate = new Date(Math.max(startDate != null ? startDate : date, date - maxHoursBefore * HOUR_IN_MILLISECONDS));
+  var clippedEndDate = new Date(Math.min(endDate != null ? endDate : date, date + maxHoursAfter * HOUR_IN_MILLISECONDS));
   // Round the dates to minutes to make caching more likely.
   clippedStartDate.setMilliseconds(0);
   clippedStartDate.setSeconds(0);
@@ -1084,8 +1096,8 @@ date) {
 // 1 day to past, 10 days to future
 var clipInterval = [1 * 24, 10 * 24];
 var constructTimeInterval = function constructTimeInterval(collection, instance, parameter) {
-  var _instance$extent2, _collection$extent3;
-  var interval = ((_instance$extent2 = instance.extent) == null || (_instance$extent2 = _instance$extent2.temporal) == null ? void 0 : _instance$extent2.interval[0]) || (collection == null || (_collection$extent3 = collection.extent) == null || (_collection$extent3 = _collection$extent3.temporal) == null ? void 0 : _collection$extent3.interval[0]);
+  var _instance$extent$temp, _instance$extent2, _collection$extent4;
+  var interval = (_instance$extent$temp = (_instance$extent2 = instance.extent) == null || (_instance$extent2 = _instance$extent2.temporal) == null ? void 0 : _instance$extent2.interval[0]) != null ? _instance$extent$temp : collection == null || (_collection$extent4 = collection.extent) == null || (_collection$extent4 = _collection$extent4.temporal) == null ? void 0 : _collection$extent4.interval[0];
   var _clipEdrInterval = clipEdrInterval(interval, clipInterval[0], clipInterval[1]),
     start = _clipEdrInterval[0],
     end = _clipEdrInterval[1];
@@ -1103,14 +1115,14 @@ var EARTH_RADIUS = 6371;
  * @returns feature nearest to the target location or null if none are within the maximum distance
  */
 var findNearestPoint = function findNearestPoint(targetLocation, pointFeatures, maxDistanceKm) {
-  var _pointFeatures$reduce;
+  var _pointFeatures$reduce, _pointFeatures$reduce2;
   if (maxDistanceKm === void 0) {
     maxDistanceKm = 2;
   }
   if (!pointFeatures.length) {
     return null;
   }
-  return ((_pointFeatures$reduce = pointFeatures.reduce(function (nearestPoint, currentFeature) {
+  return (_pointFeatures$reduce = (_pointFeatures$reduce2 = pointFeatures.reduce(function (nearestPoint, currentFeature) {
     var _getFeatureCenterPoin = getFeatureCenterPoint(currentFeature),
       featureLon = _getFeatureCenterPoin[0],
       featureLat = _getFeatureCenterPoin[1];
@@ -1131,7 +1143,7 @@ var findNearestPoint = function findNearestPoint(targetLocation, pointFeatures,
       };
     }
     return nearestPoint;
-  }, null)) == null ? void 0 : _pointFeatures$reduce.feature) || null;
+  }, null)) == null ? void 0 : _pointFeatures$reduce2.feature) != null ? _pointFeatures$reduce : null;
 };
 var getFeatureCenterPoint = function getFeatureCenterPoint(feature) {
   return feature.geometry.type === 'Point' ? feature.geometry.coordinates : turf.center(feature).geometry.coordinates;
@@ -4121,12 +4133,13 @@ var filterCollectionsParametersFromService = function filterCollectionsParameter
       return filteredCollectionList;
     }
     var collectionContainsSearch = searchStringArray.every(function (search) {
-      var _collection$collectio, _collection$serviceId, _collection$serviceNa;
+      var _collection$collectio, _collection$collectio2, _collection$serviceId, _collection$serviceNa;
       var searchLowercase = search.toLowerCase();
       var isSearchTextInCollectionId = (_collection$collectio = collection.collectionId) == null ? void 0 : _collection$collectio.toLowerCase().includes(searchLowercase);
+      var isSearchTextInCollectionTitle = (_collection$collectio2 = collection.collectionTitle) == null ? void 0 : _collection$collectio2.toLowerCase().includes(searchLowercase);
       var isSearchTextInServiceId = (_collection$serviceId = collection.serviceId) == null ? void 0 : _collection$serviceId.toLowerCase().includes(searchLowercase);
       var isSearchTextInServiceName = (_collection$serviceNa = collection.serviceName) == null ? void 0 : _collection$serviceNa.toLowerCase().includes(searchLowercase);
-      return isSearchTextInCollectionId || isSearchTextInServiceId || isSearchTextInServiceName;
+      return isSearchTextInCollectionId || isSearchTextInCollectionTitle || isSearchTextInServiceId || isSearchTextInServiceName;
     });
     // Not found in collection - search in parameters
     var filteredParamters = collection.parameters.reduce(function (filteredParameterList, parameter) {
@@ -4168,6 +4181,7 @@ var fontStyling = function fontStyling(primary) {
     lineHeight: '14px',
     fontWeight: primary ? 500 : 'normal',
     textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap',
     overflow: 'hidden'
   };
 };
@@ -4274,10 +4288,11 @@ var TimeSeriesSelectList = function TimeSeriesSelectList(_ref) {
                       alignItems: 'center'
                     },
                     children: [jsxs(Grid, {
+                      size: "grow",
                       children: [jsx(Box, {
                         sx: fontStyling(),
                         children: jsx(SearchHighlight, {
-                          text: collectionListItem.collectionId,
+                          text: collectionListItem.collectionTitle || collectionListItem.collectionId,
                           search: searchFilter
                         })
                       }), jsx(Box, {
@@ -4325,6 +4340,7 @@ var TimeSeriesSelectList = function TimeSeriesSelectList(_ref) {
                       ' .MuiListItemText-primary': {
                         fontSize: '12px',
                         fontWeight: 500,
+                        whiteSpace: 'nowrap',
                         textOverflow: 'ellipsis',
                         overflow: 'hidden'
                       }
@@ -4373,6 +4389,7 @@ var TimeSeriesSelectList = function TimeSeriesSelectList(_ref) {
                           alignItems: 'center'
                         },
                         children: [jsx(Grid, {
+                          size: "grow",
                           children: jsx(Box, {
                             sx: fontStyling(),
                             children: jsx(SearchHighlight, {
@@ -5544,7 +5561,7 @@ var ParameterInfoDialog = function ParameterInfoDialog(_ref) {
     onClose: onClose,
     startSize: {
       width: 288,
-      height: dialogHeight || 650
+      height: dialogHeight != null ? dialogHeight : 650
     },
     startPosition: {
       top: 150,
@@ -5580,8 +5597,14 @@ var ParameterInfoDialog = function ParameterInfoDialog(_ref) {
           value: relatedService.type
         })]
       }), jsx(ParameterInfoText$1, {
-        label: t('timeseries-collection'),
+        label: t('timeseries-collection-id'),
         value: currentParameterInfo.collectionId
+      }), (collectionInformation == null ? void 0 : collectionInformation.collectionTitle) && (collectionInformation == null ? void 0 : collectionInformation.collectionTitle) !== '' && jsx(ParameterInfoText$1, {
+        label: t('timeseries-collection-title'),
+        value: collectionInformation == null ? void 0 : collectionInformation.collectionTitle
+      }), (collectionInformation == null ? void 0 : collectionInformation.collectionDescription) && (collectionInformation == null ? void 0 : collectionInformation.collectionDescription) !== '' && jsx(ParameterInfoText$1, {
+        label: t('timeseries-collection-description'),
+        value: collectionInformation == null ? void 0 : collectionInformation.collectionDescription
       }), jsx(QueryInfoElement, {
         queryInformation: collectionInformation,
         isLoadingCollectionInformation: isLoadingCollectionInformation

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/time-series",
-  "version": "14.0.1",
+  "version": "14.1.0",
   "description": "GeoWeb time-series library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -9,26 +9,26 @@
   },
   "dependencies": {
     "immer": "^10.0.3",
-    "@opengeoweb/shared": "14.0.1",
+    "@opengeoweb/shared": "14.1.0",
     "@reduxjs/toolkit": "^2.6.1",
     "react-redux": "^9.2.0",
-    "@opengeoweb/webmap": "14.0.1",
-    "@opengeoweb/webmap-react": "14.0.1",
+    "@opengeoweb/webmap": "14.1.0",
+    "@opengeoweb/webmap-react": "14.1.0",
     "lodash": "^4.17.21",
-    "@opengeoweb/api": "14.0.1",
-    "@opengeoweb/theme": "14.0.1",
-    "@opengeoweb/store": "14.0.1",
+    "@opengeoweb/api": "14.1.0",
+    "@opengeoweb/theme": "14.1.0",
+    "@opengeoweb/store": "14.1.0",
     "echarts-for-react": "^3.0.2",
     "echarts": "^5.4.3",
     "react-sortablejs": "^6.1.4",
-    "@opengeoweb/snackbar": "14.0.1",
+    "@opengeoweb/snackbar": "14.1.0",
     "react-window": "^1.8.10",
     "react-virtualized-auto-sizer": "^1.0.21",
     "msw": "^2.7.3",
     "i18next": "^25.0.1",
     "react-i18next": "^15.1.1",
-    "@opengeoweb/core": "14.0.1",
-    "@opengeoweb/form-fields": "14.0.1",
+    "@opengeoweb/core": "14.1.0",
+    "@opengeoweb/form-fields": "14.1.0",
     "@mui/material": "^7.0.1",
     "react-hook-form": "^7.61.1",
     "uuid": "^10.0.0",

package/src/lib/components/TimeSeriesSelect/utils.d.ts

@@ -3,6 +3,8 @@ import { ServiceFilterChipsObjectEntities } from '../../store/types';
 import { CustomDimension, EDRDataQueriesObject, EDRExtentObject, SelectParameter } from '../TimeSeries/types';
 export interface TimeseriesCollectionDetail {
     collectionId: string;
+    collectionTitle?: string;
+    collectionDescription?: string;
     serviceId: string;
     serviceName: string;
     parameters: SelectParameter[];