@opengeoweb/webmap-react 13.2.1 → 14.0.0

package/index.esm.js

@@ -1,4 +1,4 @@
-import { WMImageStore, WMInvalidDateValues, getCorrectWMSDimName, WMJSDimension, webmapUtils, WMLayer, LayerType, legendImageStore, WMImageEventType, getLegendGraphicURLForLayer, WEBMAP_NAMESPACE, WMProj4Defs, privateWebMapUtils, tilesettings } from '@opengeoweb/webmap';
+import { WMImageStore, WMImageStoreLoadType, WMInvalidDateValues, getCorrectWMSDimName, WMJSDimension, webmapUtils, WMLayer, LayerType, legendImageStore, WMImageEventType, getLegendGraphicURLForLayer, WEBMAP_NAMESPACE, WMProj4Defs, privateWebMapUtils, tilesettings } from '@opengeoweb/webmap';
 export { WEBMAP_NAMESPACE, webmapTranslations } from '@opengeoweb/webmap';
 import * as React from 'react';
 import React__default, { createContext, useMemo, useRef, useState, useEffect, useCallback, useContext, useLayoutEffect } from 'react';
@@ -794,7 +794,8 @@ var WorkerQueue = /*#__PURE__*/function () {
         // eslint-disable-next-line no-param-reassign
         job.cancelled = true;
       });
-      this.taskQueue = [];
+      this.taskQueue.length = 0;
+      this.tasksInProcess.length = 0;
     }
   }, {
     key: "addJobs",
@@ -818,8 +819,8 @@ var WorkerQueue = /*#__PURE__*/function () {
       }
       this.tasksInProcess.push(job);
       job.task().then(function (finalise) {
-        if (!job.cancelled && finalise) {
-          finalise();
+        if (finalise) {
+          finalise(job.cancelled);
         }
       })["catch"](function (e) {
         window.console.error(e);
@@ -897,7 +898,7 @@ var TimeAwareImageWrapper = /*#__PURE__*/function (_ImageWrapper) {
     key: "getWMSGetMapRequestURL",
     value: function getWMSGetMapRequestURL(extentToLoad, resolutionToLoad, __pixelRatio, projection, getMapUrl, params, layerName, styleName, dimProps) {
       var pixelRatio = 1; // TODO?
-      if (!getMapUrl || !layerName) {
+      if (!getMapUrl || !layerName || !extentToLoad || (extentToLoad === null || extentToLoad === void 0 ? void 0 : extentToLoad.length) === 0) {
         return {
           src: '',
           extent: this.extent,
@@ -1007,7 +1008,7 @@ var TimeAwareImageWrapper = /*#__PURE__*/function (_ImageWrapper) {
         if (imageEl.hasError()) {
           this._rejectAll(imageEl.getSrc());
         } else {
-          this._resolveAll();
+          this._resolveAll(imageEl);
         }
         return;
       }
@@ -1035,10 +1036,10 @@ var TimeAwareImageWrapper = /*#__PURE__*/function (_ImageWrapper) {
     }
   }, {
     key: "_resolveAll",
-    value: function _resolveAll() {
+    value: function _resolveAll(image) {
       while (this._resolvers.length !== 0) {
         var resolve = this._resolvers.pop();
-        resolve && resolve.resolve();
+        resolve && resolve.resolve(image);
       }
     }
   }, {
@@ -1078,6 +1079,7 @@ var TimeawareImageSource = /*#__PURE__*/function (_ImageSource) {
     var wmsUrl = _ref.wmsUrl,
       timeStampsToPrefetch = _ref.timeStampsToPrefetch,
       layerName = _ref.layerName,
+      layerId = _ref.layerId,
       styleName = _ref.styleName,
       dimProps = _ref.dimProps,
       params = _ref.params,
@@ -1097,14 +1099,21 @@ var TimeawareImageSource = /*#__PURE__*/function (_ImageSource) {
     _this.hasImageLoadedForTimeValue = _this.hasImageLoadedForTimeValue.bind(_this);
     _this.setImageForTimeValue = _this.setImageForTimeValue.bind(_this);
     _this._conditionalPrefetch = _this._conditionalPrefetch.bind(_this);
-    _this.throttledPrefetch = throttle(_this._conditionalPrefetch, 1000, {
-      leading: false,
+    // These throttle settings ensure that prefetching starts after 200ms of inactivity, but at the same time
+    // if there is a continuous stream of changes (like when moving the map), it will still trigger at least every 2 seconds.
+    // This ensures that prefetching also happens when the user is continuously interacting with the map, but at a throttled rate.
+    _this.throttledPrefetch = throttle(throttle(_this._conditionalPrefetch, 2000, {
+      leading: true,
       trailing: true
+    }), 200, {
+      leading: true,
+      trailing: false
     });
     _this.throttledImageLoad = debounce(_this._loadImagery, 100, {
       leading: false,
       trailing: true
     });
+    _this._layerId = layerId;
     _this.triggerPrefetch = _this.triggerPrefetch.bind(_this);
     _this._imWrapperEmptyButLoading = initImageWrapper();
     _this._imWrapperForOlSource = initImageWrapper();
@@ -1131,8 +1140,6 @@ var TimeawareImageSource = /*#__PURE__*/function (_ImageSource) {
           timeStampsToPrefetch: this._timeStampsToPrefetch,
           dimProperties: this._dimProperties
         };
-        // Clear old jobs
-        this._prefetchWorkers.clearJobs();
         this.prefetch(extent, resolution, pixelRatio, projection);
       }
     }
@@ -1140,11 +1147,18 @@ var TimeawareImageSource = /*#__PURE__*/function (_ImageSource) {
     key: "_loadImagery",
     value: function _loadImagery(dimProperties) {
       var _this2 = this;
+      // Tell the imagestore that we are about to do a GetMap request
+      openLayersGetMapImageStore.loadDuration.setLoadingStatusForId(WMImageStoreLoadType.GETMAP, this._layerId, 0, 1, true);
       // Load the newly requested image
-      this._imWrapperForOlSource.loadAndResolve(this._lastRequestedExtent, this._lastRequestedResolution, this._lastRequestedPixelRatio, this._lastRequestedProjection, this._wmsUrl, this._extraWMSParams, this._layerName, this._styleName, dimProperties ? _objectSpread2({}, dimProperties) : _objectSpread2({}, this._dimProperties))["catch"](function () {
+      this._imWrapperForOlSource.loadAndResolve(this._lastRequestedExtent, this._lastRequestedResolution, this._lastRequestedPixelRatio, this._lastRequestedProjection, this._wmsUrl, this._extraWMSParams, this._layerName, this._styleName, dimProperties ? _objectSpread2({}, dimProperties) : _objectSpread2({}, this._dimProperties)).then(function (el) {
+        // Tell the imagestore that GetMap request was finished.
+        openLayersGetMapImageStore.loadDuration.setLoadDurationForId(_this2._layerId, el.getLoadDuration());
+      })["catch"](function () {
         // TODO, enable error handling
         // console.error(e);
       })["finally"](function () {
+        // Tell the imagestore that GetMap request was finished.
+        openLayersGetMapImageStore.loadDuration.setLoadingStatusForId(WMImageStoreLoadType.GETMAP, _this2._layerId, 1, 1);
         _this2._loadedExtent = _this2._lastRequestedExtent;
         _this2._loadedResolution = _this2._lastRequestedResolution;
         _this2._loadedPixelRatio = _this2._lastRequestedPixelRatio;
@@ -1158,20 +1172,51 @@ var TimeawareImageSource = /*#__PURE__*/function (_ImageSource) {
     key: "prefetch",
     value: function prefetch(extent, resolution, pixelRatio, projection) {
       var _this3 = this;
+      var dimensionsToPrefetchUnFiltered = this._timeStampsToPrefetch;
+      // Only work on imagery that still needs to be loaded.
+      var dimensionsToPrefetch = dimensionsToPrefetchUnFiltered.filter(function (dimValue) {
+        var hasExactImage = _this3._imWrapperForOlSource.hasImage(extent, resolution, pixelRatio, projection, _this3._wmsUrl, _this3._extraWMSParams, _this3._layerName, _this3._styleName, _objectSpread2(_objectSpread2({}, _this3._dimProperties), {}, {
+          TIME: dimValue
+        }));
+        return hasExactImage === false || !hasExactImage.isLoadedWithoutErrors;
+      });
+      if (dimensionsToPrefetch.length === 0) {
+        return;
+      }
       this._prefetchWorkers.clearJobs();
-      var dimensionsToPrefetch = this._timeStampsToPrefetch;
       var jobs = dimensionsToPrefetch.slice(0, MAX_NUMBER_TO_PREFETCH).map(function (dimValue) {
         return {
           dimValue: dimValue,
           cancelled: false,
-          task: function task() {
-            return _this3._imWrapperForPrefetch.loadAndResolve(extent, resolution, pixelRatio, projection, _this3._wmsUrl, _this3._extraWMSParams, _this3._layerName, _this3._styleName, _objectSpread2(_objectSpread2({}, _this3._dimProperties), {}, {
-              TIME: dimValue
+          task: function () {
+            var _task = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    _context.next = 2;
+                    return _this3._imWrapperForPrefetch.loadAndResolve(extent, resolution, pixelRatio, projection, _this3._wmsUrl, _this3._extraWMSParams, _this3._layerName, _this3._styleName, _objectSpread2(_objectSpread2({}, _this3._dimProperties), {}, {
+                      TIME: dimValue
+                    }))["catch"](function (e) {
+                      console.error(e);
+                    });
+                  case 2:
+                    return _context.abrupt("return", function (cancelled) {
+                      openLayersGetMapImageStore.loadDuration.setLoadingStatusForId(WMImageStoreLoadType.PREFETCH, _this3._layerId, dimensionsToPrefetch.length - _this3._prefetchWorkers.taskQueue.length, dimensionsToPrefetch.length);
+                    });
+                  case 3:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _callee);
             }));
-          }
+            function task() {
+              return _task.apply(this, arguments);
+            }
+            return task;
+          }()
         };
       });
-      (dimensionsToPrefetch === null || dimensionsToPrefetch === void 0 ? void 0 : dimensionsToPrefetch.length) > 0 && this._prefetchWorkers.addJobs(jobs);
+      this._prefetchWorkers.addJobs(jobs);
     }
   }, {
     key: "triggerPrefetch",
@@ -1326,17 +1371,6 @@ var makeDimValuesToPrefetch = function makeDimValuesToPrefetch(wmTimeDim, stepsT
       var dimValuesToPrefetch = dimensionValuesToPrefetchCombined.map(function (timeStamp) {
         return wmTimeDim.getClosestValueForTime(timeStamp);
       });
-      // TODO: When animating with two maps, the not leading map does get the wrong prefetch values. Use the following to debug this
-      // if (dimensionValuesToPrefetch.length === 0) {
-      //   console.warn(
-      //     'NOTHING TO PREFETCH',
-      //     stepsToCheck.map((s) => {
-      //       return new Date(s).toISOString();
-      //     }),
-      //     wmTimeDim.getFirstValue(),
-      //     wmTimeDim.getLastValue(),
-      //   );
-      // }
       return dimValuesToPrefetch;
     }
   }
@@ -1591,6 +1625,7 @@ var fetchEDRLayerCollectionCube = /*#__PURE__*/function () {
 var DEFAULT_STALE_TIME = 60000; // One minute
 var useEDRLayerCollection = function useEDRLayerCollection(edrBaseUrlWithCollection) {
   var instanceId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  var enabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   return useQuery({
     staleTime: DEFAULT_STALE_TIME,
     queryKey: [edrBaseUrlWithCollection, instanceId, 'useEDRLayerCollection'],
@@ -1611,7 +1646,7 @@ var useEDRLayerCollection = function useEDRLayerCollection(edrBaseUrlWithCollect
       }
       return queryFn;
     }(),
-    enabled: edrBaseUrlWithCollection.length > 0
+    enabled: edrBaseUrlWithCollection.length > 0 && enabled
   });
 };
 var useEDRLayerCollectionCube = function useEDRLayerCollectionCube(edrBaseUrlWithCollection, parameterName) {
@@ -2044,6 +2079,42 @@ var styleNameToStyleLikeNotMemoed = function styleNameToStyleLikeNotMemoed(style
   };
 };
 var styleNameToStyleLike = memoize(styleNameToStyleLikeNotMemoed);
+var defaultEdrStyles = [{
+  name: 'temperatureLegendColorsWoW:-18,38',
+  title: 'WOW Legend -18 till 18 degrees',
+  "abstract": 'temperatureLegendColorsWoW',
+  legendURL: ''
+}, {
+  name: 'temperatureLegendColorsWoW:0,20',
+  title: 'WOW Legend 0 till 20 degrees',
+  "abstract": 'temperatureLegendColorsWoW',
+  legendURL: ''
+}, {
+  name: 'temperatureLegendColorsWoW:10,20',
+  title: 'WOW Legend 10 till 20 degrees',
+  "abstract": 'temperatureLegendColorsWoW',
+  legendURL: ''
+}, {
+  name: 'temperatureLegendColorsCWK',
+  title: 'temperatureLegendColorsCWK',
+  "abstract": 'temperatureLegendColorsCWK',
+  legendURL: ''
+}, {
+  name: 'precipitationMMLegendColorsWoW:0,30',
+  title: '0 till 30 mm/h',
+  "abstract": 'precipitationMMLegendColorsWoW',
+  legendURL: ''
+}, {
+  name: 'precipitationMMLegendColorsWoW:0,3',
+  title: '0 till 3 mm/h',
+  "abstract": 'precipitationMMLegendColorsWoW',
+  legendURL: ''
+}, {
+  name: 'wind/direction-speed',
+  title: 'Wind direction and speed',
+  "abstract": '',
+  legendURL: ''
+}];
 
 /**
  * Returns WMLayer instance in EDR mode. The layer will contains parsed dimensions and styles and keeps a state for these properties.
@@ -10593,7 +10664,7 @@ var GeoJSONTextField = function GeoJSONTextField(_ref) {
     try {
       onChangeGeoJSON(JSON.parse(event.target.value));
       setValidity(true);
-    } catch (e) {
+    } catch (_e) {
       onChangeGeoJSON(null);
       setValidity(false);
     }
@@ -11439,9 +11510,7 @@ var moveFeature = function moveFeature(currentGeoJSON, newGeoJSON, featureLayerI
  * @param intersectB Feature B
  * @returns The intersection of the two features.
  */
-var intersectPointGeoJSONS = function intersectPointGeoJSONS(
-// eslint-disable-next-line id-length
-intersectA, intersectB) {
+var intersectPointGeoJSONS = function intersectPointGeoJSONS(intersectA, intersectB) {
   var geoJSONProperties = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
     stroke: '#FF0000',
     'stroke-width': 10.0,
@@ -11530,7 +11599,7 @@ var createInterSections = function createInterSections(geojson, otherGeoJSON) {
         return addFeatureProperties(intersectPointGeoJSONS(geojson, otherGeoJSON), geoJSONproperties);
       }
       return addFeatureProperties(intersectPolygonGeoJSONS(geojson, otherGeoJSON), geoJSONproperties);
-    } catch (error) {
+    } catch (_error) {
       return addFeatureProperties(geojson, geoJSONproperties);
     }
   });
@@ -13960,6 +14029,7 @@ var TimeawareImageSourceWMSLayer = function TimeawareImageSourceWMSLayer(_ref) {
   var dimensionsValuesEffectCheck = dimensionsValues && Object.entries(dimensionsValues).map(function (dimensionNameAndCurrentValue) {
     return "".concat(dimensionNameAndCurrentValue[0], ":").concat(dimensionNameAndCurrentValue[1]);
   }).join(',');
+  var prefetchListEffectCheck = (prefetchList !== null && prefetchList !== void 0 ? prefetchList : []).join(',');
   // Make a TimeawareImageSource and add it to the map, add and remove should only be done when the map changes, layer id changes, visibility changes or dimensionsValues get defined.
   useEffect(function () {
     if (!map || !wmLayer || visible === false || !dimensionsValues) {
@@ -13970,6 +14040,7 @@ var TimeawareImageSourceWMSLayer = function TimeawareImageSourceWMSLayer(_ref) {
       source: new TimeawareImageSource({
         wmsUrl: wmLayer.getmapURL,
         layerName: wmLayer.name,
+        layerId: layerId || '',
         styleName: styleName,
         dimProps: dimensionsValues,
         timeStampsToPrefetch: [],
@@ -13999,7 +14070,7 @@ var TimeawareImageSourceWMSLayer = function TimeawareImageSourceWMSLayer(_ref) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              if (!(wmLayer && visible !== false)) {
+              if (!wmLayer) {
                 _context.next = 11;
                 break;
               }
@@ -14059,8 +14130,9 @@ var TimeawareImageSourceWMSLayer = function TimeawareImageSourceWMSLayer(_ref) {
       return window.console.error(e);
     });
     return function () {};
+    // Effect array should only contain wmLayer and layerName
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [wmLayer, layerName, visible]);
+  }, [wmLayer, layerName]);
   // Layer opacity and zIndex useEffect
   useEffect(function () {
     if (!layerOptions || !layer) {
@@ -14127,7 +14199,7 @@ var TimeawareImageSourceWMSLayer = function TimeawareImageSourceWMSLayer(_ref) {
     // - styleName,
     // - dimensionsValuesEffectCheck,
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [layer, wmLayer, prefetchList, layerName, styleName, dimensionsValuesEffectCheck]);
+  }, [layer, wmLayer, prefetchListEffectCheck, layerName, styleName, dimensionsValuesEffectCheck]);
   // Only show debug info for data layers with time dimension
   var hasTimeDim = (_wmLayer$dimensions$f = wmLayer === null || wmLayer === void 0 || (_wmLayer$dimensions4 = wmLayer.dimensions) === null || _wmLayer$dimensions4 === void 0 ? void 0 : _wmLayer$dimensions4.findIndex(function (dimension) {
     return dimension.name === 'time';
@@ -14422,7 +14494,7 @@ var useViewFromLayer = function useViewFromLayer(layerProps) {
   if (viewRef.current === null) {
     try {
       viewRef.current = new View(baseView);
-    } catch (e) {
+    } catch (_e) {
       viewRef.current = new View({
         projection: 'EPSG:3857',
         zoom: 1,
@@ -14448,7 +14520,6 @@ var useViewFromLayer = function useViewFromLayer(layerProps) {
 var USEANIMATIONFORLAYER_DEFAULT_NUMSTEPS = 48;
 var USEANIMATIONFORLAYER_DEFAULT_UPDATEINTERVALMS = 60000;
 var USEANIMATIONFORLAYER_DEFAULT_MSINHOUR = 3600000;
-// eslint-disable-next-line import/prefer-default-export
 var useAnimationForLayer = function useAnimationForLayer(layerProps, intervalInMs) {
   var numStepsTillLatest = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : USEANIMATIONFORLAYER_DEFAULT_NUMSTEPS;
   var checkForUpdatesMs = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : USEANIMATIONFORLAYER_DEFAULT_UPDATEINTERVALMS;
@@ -14532,7 +14603,6 @@ var useAnimationForLayer = function useAnimationForLayer(layerProps, intervalInM
       }
     }, _callee);
   })), [calculateTimeSpan, wmLayer]);
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   useSetIntervalWhenVisible(refetchLayer, checkForUpdatesMs);
   return {
     dimensions: [{
@@ -15267,7 +15337,7 @@ var FeatureLayer = function FeatureLayer(_ref) {
   }, [style]);
   useEffect(function () {
     // Handle opacity:
-    if (layerRef.current && opacity) {
+    if (layerRef.current && opacity !== undefined) {
       var _layerRef$current2;
       (_layerRef$current2 = layerRef.current) === null || _layerRef$current2 === void 0 || _layerRef$current2.setOpacity(opacity);
     }
@@ -15373,7 +15443,6 @@ var OpenLayersFeatureLayer = function OpenLayersFeatureLayer(_ref) {
   var featureCollectionHasChanges = featureCollectionRef.current !== featureCollection;
   if (featureCollectionHasChanges) {
     if (projection && featureCollection) {
-      // eslint-disable-next-line no-console
       featureCollectionRef.current = featureCollection;
       var formatter = new GeoJSON({
         featureProjection: projection
@@ -15731,6 +15800,13 @@ var FEATURE_STROKE_EDIT = new Stroke({
   color: '#e14',
   width: 1.5 + 1
 });
+var FEATURE_FILL_SELECTED = new Fill({
+  color: '#186DFF'
+});
+var FEATURE_STROKE_SELECTED = new Stroke({
+  color: '#186DFF',
+  width: 1.5 + 1
+});
 var FEATURE_VERTICE_IMAGE = new Circle({
   radius: 5,
   stroke: new Stroke({
@@ -15759,6 +15835,16 @@ var ICON_LOCATIONMARKER = createIconStyle(locationPath, {
     anchor: [0.5, 1]
   }
 });
+var ICON_LOCATIONMARKER_SELECTED = createIconStyle(locationPath, {
+  render: {
+    fillStyle: '#186DFF',
+    strokeStyle: '#186DFF',
+    lineWidth: 2
+  },
+  icon: {
+    anchor: [0.5, 1]
+  }
+});
 var ICON_LOCATIONMARKER_MODIFY = createIconStyle(locationPath, {
   render: {
     fillStyle: '#eee',
@@ -16003,14 +16089,26 @@ var stylesByMapFeatureClass = _defineProperty(_defineProperty(_defineProperty(_d
   return !feature.get('hover') ? FEATURE_EDR : [].concat(FEATURE_EDR_HOVER, [textLabelStyle(feature.getProperties().name)]);
 }), MapFeatureClass.EDRMultiPolygon, function (feature) {
   return !feature.get('hover') ? FEATURE_EDR : [].concat(FEATURE_EDR_HOVER, [multiPolygonLabelStyle(feature.getProperties().name)]);
-}), MapFeatureClass["default"], [
-// Polygon / LineString
-new Style$1({
-  fill: FEATURE_FILL,
-  stroke: FEATURE_STROKE
-}),
-// Point
-ICON_LOCATIONMARKER]);
+}), MapFeatureClass["default"], function (feature) {
+  if (feature.get('highlightSelectedFeature')) {
+    return [
+    // Polygon / LineString
+    new Style$1({
+      fill: FEATURE_FILL_SELECTED,
+      stroke: FEATURE_STROKE_SELECTED
+    }),
+    // Point
+    ICON_LOCATIONMARKER_SELECTED];
+  }
+  return [
+  // Polygon / LineString
+  new Style$1({
+    fill: FEATURE_FILL,
+    stroke: FEATURE_STROKE
+  }),
+  // Point
+  ICON_LOCATIONMARKER];
+});
 var geowebColorToOpenLayersColor = function geowebColorToOpenLayersColor(color, opacity) {
   // Return as-is if no opacity, or non-hex color (we do not know how to add opacity to non-hex colors)
   if (color[0] !== '#' || opacity === undefined) {
@@ -16095,7 +16193,7 @@ var genericOpenLayersFeatureStyle = function genericOpenLayersFeatureStyle(featu
     }
     return undefined;
   }
-  var shouldHighlight = mapFeatureClass !== MapFeatureClass.ObservationStation && !showNameOnHover && selectionType !== 'fir';
+  var shouldHighlight = geometry && geometry.getType() !== 'Point' && mapFeatureClass !== MapFeatureClass.ObservationStation && !showNameOnHover && selectionType !== 'fir';
   // Highlight map polygons on hover
   if (hover && shouldHighlight) {
     return new Style$1({
@@ -16654,4 +16752,4 @@ var getLayerUpdateInfo = function getLayerUpdateInfo(wmLayer, mapId) {
   return updateObject;
 };
 
-export { BaseLayerType, ClickOnMapTool, DRAWMODE, DefaultBaseLayers, DimensionSelectButton, DimensionSelectDialog, DimensionSelectSlider, EditModeButton as EditModeButtonField, FEATURE_FILL, FEATURE_STROKE, FEATURE_STROKE_EDIT, FEATURE_VERTICES_EDIT_HANDLES, FEATURE_VERTICE_HANDLE_IMAGE, FEATURE_VERTICE_IMAGE, FeatureLayer, FeatureLayers, GeoJSONTextField, ICON_LOCATIONMARKER, ICON_LOCATIONMARKER_MODIFY, IntersectionSelect, LayerInfoButton, LayerInfoDialog, LayerInfoLegend, LayerInfoList, LayerInfoText, Legend, LegendButton, LegendDialog, LegendLayout, MapContext, MapControlButton, MapControls, MapDimensionSelect, MapFeatureClass, MapTime, MapWarningProperties, NEW_FEATURE_CREATED, NEW_LINESTRING_CREATED, NEW_POINT_CREATED, OpenLayersFeatureLayer, OpenLayersGetFeatureInfo, OpenLayersLayer, OpenLayersMapDraw, OpenLayersMapView, OpenLayersZoomControl, Proj4js, SelectField, StoryLayoutGrid, TimeAwareEDRLocationLayer, TimeContext, TimeawareImageSource, TimeawareImageSourceWMSLayer, WEBMAP_REACT_NAMESPACE, WMSLayer, WMTSLayer, XYZLayer, ZoomControls, addFeatureProperties, addGeoJSONProperties, addSelectionTypeToGeoJSON, basicExampleDrawOptions, basicExampleMultipleShapeDrawOptions, basicExampleMultipleShapeWithValuesDrawOptions, basicExampleSmoothLineOptions, catmullRomSpline, clearImageCacheForAllMaps, colorMaps, createIconStyle, createInterSections, currentlySupportedDrawModes, defaultBox, defaultDelete, defaultGeoJSONStyleProperties, defaultIntersectionStyleProperties, defaultLayers, defaultModes, defaultPoint, defaultPolygon, defaultTimeFormat, dimensionConfig, drawPolyStoryStyles, drawStyles, emptyGeoJSON, endToolExampleConfig, exampleIntersectionOptions, exampleIntersectionWithShapeOptions, exampleIntersections, exampleIntersectionsMultiDrawTool, fakeEdrLayerApiHandlers, featureBox, featureMultiPoint, featurePoint, featurePolygon, fillOptions, firSelectionType, formatTime, generateImageFromLegend, genericOpenLayersFeatureStyle, geowebColorToOpenLayersColor, getDimensionIcon, getDimensionLabel, getDimensionValue, getDimensionsList, getDoubleControlToolIcon, getFeatureCollection, getFeatureExtent, getFirTitle, getGeoJSONPropertyValue, getGeoJson, getIcon, getIntersectionToolIcon, getIsInsideAcceptanceTime, getLastEmptyFeatureIndex, getLayerBbox, getLayerStyles, getLayerUpdateInfo, getLegendClass, getProj4, getTimeDimension, getToolIcon, initializeOpenLayersProjections, inlineFeatureStyle, intersectPointGeoJSONS, intersectPolygonGeoJSONS, intersectionFeatureBE, intersectionFeatureNL, isGeoJSONFeatureCreatedByTool, isGeoJSONGeometryEmpty, isPointFeatureCollection, lineString, lineStringCollection, makeFeatureStyleDisc, makeFeatureStyleLoading, makeFeatureStyleMultiParam, makeFeatureStyleMultiParamLoading, makeFeatureStyleWind, makeLegendFromColorMap, makeLegendFromStyleName, makeTimeList, makeView, marksByDimension, modifyStyles, moveFeature, multiLineStringLabelStyle, multiPolygonLabelStyle, opacityOptions, openLayersGetMapImageStore, precipitationMMLegendColorsWoW, projectorCache, publicLayers, publicServices, rewindGeometry, selectPreferredWMSProjection, setMapCenter, setViewFromExtent, setViewFromFeature, simpleBoxGeoJSON, simpleBoxGeoJSONWrongOrder, simpleFlightRouteLineStringGeoJSON, simpleFlightRoutePointsGeoJSON, simpleGeometryCollectionGeoJSON, simpleLineStringGeoJSON, simpleMultiPolygon, simplePointsGeojson, simplePolygonGeoJSON, simpleSmallLineStringGeoJSON, startToolExampleConfig, strokeWidthOptions, styleNameToStyleLike, temperatureLegendColorsCWK, temperatureLegendColorsWoW, textLabelStyle, textStyle, textStyleWithMargin, updateEditModeButtonsWithFir, useAnimationForLayer, useEDRLayerCollection, useEDRLayerCollectionCube, useGeoJSON, useGetEDRLayerInstance, useGetWMLayerInstance, useGetWMSLayerStyleList, useIconStyle, useMapDrawTool, useProjection, useQueryGetWMSGetCapabilities, useQueryGetWMSLayer, useQueryGetWMSLayers, useQueryGetWMSLayersTree, useQueryGetWMSServiceInfo, useQueryWMTSGetCapabilities, useSetIntervalWhenVisible, useViewFromLayer, viewUtils, webmapReactTranslations };
+export { BaseLayerType, ClickOnMapTool, DRAWMODE, DefaultBaseLayers, DimensionSelectButton, DimensionSelectDialog, DimensionSelectSlider, EditModeButton as EditModeButtonField, FEATURE_FILL, FEATURE_FILL_SELECTED, FEATURE_STROKE, FEATURE_STROKE_EDIT, FEATURE_STROKE_SELECTED, FEATURE_VERTICES_EDIT_HANDLES, FEATURE_VERTICE_HANDLE_IMAGE, FEATURE_VERTICE_IMAGE, FeatureLayer, FeatureLayers, GeoJSONTextField, ICON_LOCATIONMARKER, ICON_LOCATIONMARKER_MODIFY, ICON_LOCATIONMARKER_SELECTED, IntersectionSelect, LayerInfoButton, LayerInfoDialog, LayerInfoLegend, LayerInfoList, LayerInfoText, Legend, LegendButton, LegendDialog, LegendLayout, MapContext, MapControlButton, MapControls, MapDimensionSelect, MapFeatureClass, MapTime, MapWarningProperties, NEW_FEATURE_CREATED, NEW_LINESTRING_CREATED, NEW_POINT_CREATED, OpenLayersFeatureLayer, OpenLayersGetFeatureInfo, OpenLayersLayer, OpenLayersMapDraw, OpenLayersMapView, OpenLayersZoomControl, Proj4js, SelectField, StoryLayoutGrid, TimeAwareEDRLocationLayer, TimeContext, TimeawareImageSource, TimeawareImageSourceWMSLayer, WEBMAP_REACT_NAMESPACE, WMSLayer, WMTSLayer, XYZLayer, ZoomControls, addFeatureProperties, addGeoJSONProperties, addSelectionTypeToGeoJSON, basicExampleDrawOptions, basicExampleMultipleShapeDrawOptions, basicExampleMultipleShapeWithValuesDrawOptions, basicExampleSmoothLineOptions, catmullRomSpline, clearImageCacheForAllMaps, colorMaps, createIconStyle, createInterSections, currentlySupportedDrawModes, defaultBox, defaultDelete, defaultEdrStyles, defaultGeoJSONStyleProperties, defaultIntersectionStyleProperties, defaultLayers, defaultModes, defaultPoint, defaultPolygon, defaultTimeFormat, dimensionConfig, drawPolyStoryStyles, drawStyles, emptyGeoJSON, endToolExampleConfig, exampleIntersectionOptions, exampleIntersectionWithShapeOptions, exampleIntersections, exampleIntersectionsMultiDrawTool, fakeEdrLayerApiHandlers, featureBox, featureMultiPoint, featurePoint, featurePolygon, fillOptions, firSelectionType, formatTime, generateImageFromLegend, genericOpenLayersFeatureStyle, geowebColorToOpenLayersColor, getDimensionIcon, getDimensionLabel, getDimensionValue, getDimensionsList, getDoubleControlToolIcon, getFeatureCollection, getFeatureExtent, getFirTitle, getGeoJSONPropertyValue, getGeoJson, getIcon, getIntersectionToolIcon, getIsInsideAcceptanceTime, getLastEmptyFeatureIndex, getLayerBbox, getLayerStyles, getLayerUpdateInfo, getLegendClass, getProj4, getTimeDimension, getToolIcon, initializeOpenLayersProjections, inlineFeatureStyle, intersectPointGeoJSONS, intersectPolygonGeoJSONS, intersectionFeatureBE, intersectionFeatureNL, isGeoJSONFeatureCreatedByTool, isGeoJSONGeometryEmpty, isPointFeatureCollection, lineString, lineStringCollection, makeFeatureStyleDisc, makeFeatureStyleLoading, makeFeatureStyleMultiParam, makeFeatureStyleMultiParamLoading, makeFeatureStyleWind, makeLegendFromColorMap, makeLegendFromStyleName, makeTimeList, makeView, marksByDimension, modifyStyles, moveFeature, multiLineStringLabelStyle, multiPolygonLabelStyle, opacityOptions, openLayersGetMapImageStore, precipitationMMLegendColorsWoW, projectorCache, publicLayers, publicServices, rewindGeometry, selectPreferredWMSProjection, setMapCenter, setViewFromExtent, setViewFromFeature, simpleBoxGeoJSON, simpleBoxGeoJSONWrongOrder, simpleFlightRouteLineStringGeoJSON, simpleFlightRoutePointsGeoJSON, simpleGeometryCollectionGeoJSON, simpleLineStringGeoJSON, simpleMultiPolygon, simplePointsGeojson, simplePolygonGeoJSON, simpleSmallLineStringGeoJSON, startToolExampleConfig, strokeWidthOptions, styleNameToStyleLike, temperatureLegendColorsCWK, temperatureLegendColorsWoW, textLabelStyle, textStyle, textStyleWithMargin, updateEditModeButtonsWithFir, useAnimationForLayer, useEDRLayerCollection, useEDRLayerCollectionCube, useGeoJSON, useGetEDRLayerInstance, useGetWMLayerInstance, useGetWMSLayerStyleList, useIconStyle, useMapDrawTool, useProjection, useQueryGetWMSGetCapabilities, useQueryGetWMSLayer, useQueryGetWMSLayers, useQueryGetWMSLayersTree, useQueryGetWMSServiceInfo, useQueryWMTSGetCapabilities, useSetIntervalWhenVisible, useViewFromLayer, viewUtils, webmapReactTranslations };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap-react",
-  "version": "13.2.1",
+  "version": "14.0.0",
   "description": "GeoWeb react wrapper for webmap",
   "license": "Apache-2.0",
   "repository": {
@@ -8,9 +8,9 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/webmap": "13.2.1",
-    "@opengeoweb/theme": "13.2.1",
-    "@opengeoweb/shared": "13.2.1",
+    "@opengeoweb/webmap": "14.0.0",
+    "@opengeoweb/theme": "14.0.0",
+    "@opengeoweb/shared": "14.0.0",
     "lodash": "^4.17.21",
     "ol": "^10.4.0",
     "proj4": "^2.9.2",

package/src/lib/components/OpenLayers/OlStyles.d.ts

@@ -16,9 +16,12 @@ export declare enum MapFeatureClass {
 export declare const FEATURE_FILL: Fill;
 export declare const FEATURE_STROKE: Stroke;
 export declare const FEATURE_STROKE_EDIT: Stroke;
+export declare const FEATURE_FILL_SELECTED: Fill;
+export declare const FEATURE_STROKE_SELECTED: Stroke;
 export declare const FEATURE_VERTICE_IMAGE: Circle;
 export declare const FEATURE_VERTICE_HANDLE_IMAGE: Circle;
 export declare const ICON_LOCATIONMARKER: Style;
+export declare const ICON_LOCATIONMARKER_SELECTED: Style;
 export declare const ICON_LOCATIONMARKER_MODIFY: Style;
 export declare const FEATURE_VERTICES_EDIT_HANDLES: Style;
 export declare const textLabelStyle: (text: string) => Style;

package/src/lib/components/OpenLayers/types/WorkerQueue.d.ts

@@ -1,4 +1,4 @@
-export type FinaliseFn = () => void;
+export type FinaliseFn = (cancelled: boolean) => void;
 export interface WorkerQueueJob {
     task: () => Promise<FinaliseFn | void>;
     cancelled: boolean;

package/src/lib/components/OpenLayers/utils/TimeAwareImageWrapper.d.ts

@@ -1,7 +1,7 @@
 import { Extent } from 'ol/extent';
 import ImageWrapper from 'ol/Image';
 import { Projection } from 'ol/proj';
-import { WMImageStore } from '@opengeoweb/webmap';
+import { WMImage, WMImageStore } from '@opengeoweb/webmap';
 export declare const openLayersGetMapImageStore: WMImageStore;
 export declare const clearImageCacheForAllMaps: () => void;
 interface TimeAwareGeoreferencedImageSrc {
@@ -38,6 +38,6 @@ declare class TimeAwareImageWrapper extends ImageWrapper {
     setState(state: number): void;
     private _rejectAll;
     private _resolveAll;
-    loadAndResolve(extentToLoad: Extent, resolutionToLoad: number, pixelRatio: number, projection: Projection, getMapUrl: string, params: Record<string, string>, layerName: string, styleName: string, dimProps: Record<string, string>): Promise<void>;
+    loadAndResolve(extentToLoad: Extent, resolutionToLoad: number, pixelRatio: number, projection: Projection, getMapUrl: string, params: Record<string, string>, layerName: string, styleName: string, dimProps: Record<string, string>): Promise<WMImage>;
 }
 export default TimeAwareImageWrapper;

package/src/lib/components/OpenLayers/utils/TimeawareImageSource.d.ts

@@ -8,6 +8,7 @@ interface TimeawareImageSourceOptions {
     wmsUrl: string;
     params?: Record<string, string>;
     layerName: string;
+    layerId: string;
     dimProps?: Record<string, string>;
     styleName?: string | undefined;
     timeStampsToPrefetch?: string[];
@@ -36,7 +37,8 @@ export declare class TimeawareImageSource extends ImageSource {
     private _imWrapperForPrefetch;
     private throttledPrefetch;
     private throttledImageLoad;
-    constructor({ wmsUrl, timeStampsToPrefetch, layerName, styleName, dimProps, params, visible, }: TimeawareImageSourceOptions);
+    private _layerId;
+    constructor({ wmsUrl, timeStampsToPrefetch, layerName, layerId, styleName, dimProps, params, visible, }: TimeawareImageSourceOptions);
     private _conditionalPrefetch;
     private _loadImagery;
     private prefetch;

package/src/lib/components/OpenLayers/utils/makeDimValuesToPrefetch.d.ts

@@ -1,6 +1,7 @@
 import { WMJSDimension, Dimension, WMLayer } from '@opengeoweb/webmap';
 import { Timespan } from '../types/Timespan';
 export declare const makeDimValuesToPrefetch: (wmTimeDim: WMJSDimension, stepsToCheck: number[], isAnimating: boolean) => string[];
+export declare const extendPrefetchListWithModelRunTimeSteps: (wmLayer: WMLayer, stepsToCheck: number[]) => number[];
 /**
  * We use the WMLayer dimension logic to obtain the dimension value to use in the WMS GetMap request. The input is the dimensions array which is typically the properties set for the layer component.
  * The input time is descretized to the closest value which is available in the WMS layer.

package/src/lib/edr-layer-api/colormaps/edrOlLegendUtils.d.ts

@@ -24,3 +24,9 @@ export declare const makeFeatureStyleMultiParamLoading: () => Style;
 export declare const makeFeatureStyleDisc: (feature: FeatureLike, legend: EdrOlColorLegend) => Style;
 export declare const makeFeatureStyleLoading: (feature: FeatureLike) => Style;
 export declare const styleNameToStyleLike: ((styleName: string, multiParam?: boolean) => ((feature: FeatureLike) => Style | Style[])) & import("lodash").MemoizedFunction;
+export declare const defaultEdrStyles: {
+    name: string;
+    title: string;
+    abstract: string;
+    legendURL: string;
+}[];

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

@@ -2,6 +2,8 @@ import { EDRInstance, CoverageCollection, EdrParameters } from '@opengeoweb/shar
 import { UseQueryResult } from '@tanstack/react-query';
 export interface EdrLayerInstance extends EDRInstance {
     parameter_names?: EdrParameters;
+    title?: string;
+    description?: string;
 }
-export declare const useEDRLayerCollection: (edrBaseUrlWithCollection: string, instanceId?: string) => UseQueryResult<EdrLayerInstance, Error>;
+export declare const useEDRLayerCollection: (edrBaseUrlWithCollection: string, instanceId?: string, enabled?: boolean) => UseQueryResult<EdrLayerInstance, Error>;
 export declare const useEDRLayerCollectionCube: (edrBaseUrlWithCollection: string, parameterName: string, datetime?: string, instanceId?: string, bbox?: string) => UseQueryResult<CoverageCollection, Error>;