@opengeoweb/webmap 15.1.0 → 15.3.0

package/index.esm.js

@@ -1425,14 +1425,24 @@ var WMImageStore = /*#__PURE__*/function () {
    * @returns A WMImage which is ready to display. Can have a different extent and resolution then what was asked in srcToLoad
    */;
   _proto.getAltGeoReferencedImage = function getAltGeoReferencedImage(srcToLoad, _extent, _resolution) {
+    var imagesbyGeoRefArraySortByImageLife = this.getAltGeoReferencedImages(srcToLoad, _extent, _resolution);
+    // Now filter out the loaded images, which can be used as alternative
+    var sortByImageLifeFilterdLoaded = imagesbyGeoRefArraySortByImageLife.filter(function (image) {
+      return image.isLoadedWithoutErrors();
+    });
+    // Just return most recent available image: TODO: Possibly make use of extent and resolution to find a better one.
+    // https://gitlab.com/opengeoweb/geoweb-assets/-/issues/4481
+    return sortByImageLifeFilterdLoaded.length > 0 ? sortByImageLifeFilterdLoaded[0] : false;
+  };
+  _proto.getAltGeoReferencedImages = function getAltGeoReferencedImages(srcToLoad, _extent, _resolution) {
     var hashUrl = makeHashUrlForGeoReferencedImage(srcToLoad);
     if (!hashUrl) {
-      return false;
+      return [];
     }
     // Sort the imagesbyGeoRef array
     var imagesbyGeoRefArray = this.imagesbyGeoRef.get(hashUrl);
     if (!imagesbyGeoRefArray || imagesbyGeoRefArray.length === 0) {
-      return false;
+      return [];
     }
     // Clean the set, only keep the most recent images
     var imagesbyGeoRefArraySortByImageLife = imagesbyGeoRefArray.sort(function (imageA, imageB) {
@@ -1446,14 +1456,9 @@ var WMImageStore = /*#__PURE__*/function () {
     }).slice(0, WMIMAGESTORE_MAX_ALTIMAGES_TO_KEEP);
     // Set this array back in the array
     this.imagesbyGeoRef.set(hashUrl, imagesbyGeoRefArraySortByImageLife);
-    // Now filter out the loaded images, which can be used as alternative
-    var sortByImageLifeFilterdLoaded = imagesbyGeoRefArraySortByImageLife.filter(function (image) {
-      return image.isLoadedWithoutErrors();
-    });
-    // Just return most recent available image: TODO: Possibly make use of extent and resolution to find a better one.
-    return sortByImageLifeFilterdLoaded.length > 0 ? sortByImageLifeFilterdLoaded[0] : false;
+    return imagesbyGeoRefArraySortByImageLife;
   };
-  _proto.getGeoReferencedImage = function getGeoReferencedImage(src, geoReference) {
+  _proto.getImageAndSetGeoReference = function getImageAndSetGeoReference(src, geoReference) {
     var image = this.getImage(src);
     if (image) {
       // Make a hashUrl without BBOX
@@ -3137,7 +3142,10 @@ var WMJSDimension = /*#__PURE__*/function () {
     var timeToFind = new Date(timeStamp).toISOString().substring(0, 19) + "Z";
     return this.getClosestValue(timeToFind);
   };
-  _proto.getValueForSpecialString = function getValueForSpecialString(inputValue) {
+  _proto.getValueForSpecialString = function getValueForSpecialString(inputValue, evenWhenOutsideRange) {
+    if (evenWhenOutsideRange === void 0) {
+      evenWhenOutsideRange = false;
+    }
     // Check for special cases like: 'current', 'default, '', 'middle', 'earliest' and 'latest'
     switch (inputValue) {
       case 'current':
@@ -3147,12 +3155,16 @@ var WMJSDimension = /*#__PURE__*/function () {
       case 'middle':
         return this.getMiddleValue();
       case 'earliest':
-      case WMDateTooEarlyString:
         return this.getFirstValue();
       case 'latest':
-      case WMDateTooLateString:
         return this.getLastValue();
     }
+    if (inputValue === WMDateTooEarlyString && evenWhenOutsideRange) {
+      return this.getFirstValue();
+    }
+    if (inputValue === WMDateTooLateString && evenWhenOutsideRange) {
+      return this.getLastValue();
+    }
     return inputValue;
   };
   _proto.getExactMatchingValue = function getExactMatchingValue(inputValue) {
@@ -3180,11 +3192,11 @@ var WMJSDimension = /*#__PURE__*/function () {
     // Just make sure to return the first part if accidently start/stop/res was given.
     var firstPartValue = getFirstPartOfDimensionValueSet(inputValue);
     // Handle  'current', 'default, '', 'middle', 'earliest' and 'latest'
-    var newValue = this.getValueForSpecialString(firstPartValue);
+    var newValue = this.getValueForSpecialString(firstPartValue, evenWhenOutsideRange);
     // Get the exact value as present in the dimension values
     var matchingValue = this.getExactMatchingValue(newValue);
     // Handle  'current', 'default, '', 'middle', 'earliest' and 'latest'
-    return evenWhenOutsideRange ? this.getValueForSpecialString(matchingValue) : matchingValue;
+    return evenWhenOutsideRange ? this.getValueForSpecialString(matchingValue, evenWhenOutsideRange) : matchingValue;
   }
   /**
    * Get dimension value for specified index

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/webmap",
-  "version": "15.1.0",
+  "version": "15.3.0",
   "description": "GeoWeb webmap library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -8,7 +8,7 @@
     "url": "git@gitlab.com:opengeoweb/opengeoweb.git"
   },
   "dependencies": {
-    "@opengeoweb/shared": "15.1.0",
+    "@opengeoweb/shared": "15.3.0",
     "@tanstack/query-core": "^5.69.2",
     "lodash": "^4.17.21",
     "i18next": "^25.0.1",

package/src/lib/components/WMImageStore.d.ts

@@ -49,7 +49,8 @@ export default class WMImageStore {
      * @returns A WMImage which is ready to display. Can have a different extent and resolution then what was asked in srcToLoad
      */
     getAltGeoReferencedImage(srcToLoad: string, _extent: number[], _resolution: number): WMImage | false;
-    getGeoReferencedImage(src: string, geoReference: WMGeoReference): WMImage;
+    getAltGeoReferencedImages(srcToLoad: string, _extent: number[], _resolution: number): WMImage[];
+    getImageAndSetGeoReference(src: string, geoReference: WMGeoReference): WMImage;
     getNumCached(): number;
     /**
      * Get an WMImage object for given URL

package/src/lib/components/WMJSDimension.d.ts

@@ -74,7 +74,7 @@ export default class WMJSDimension implements Dimension {
     addTimeRangeDurationToValue(value: string): string;
     setTimeRangeDuration(duration: string): void;
     getClosestValueForTime(timeStamp: number): string;
-    getValueForSpecialString(inputValue: string): string;
+    getValueForSpecialString(inputValue: string, evenWhenOutsideRange?: boolean): string;
     getExactMatchingValue(inputValue: string): string;
     getClosestValue(inputValue: string, evenWhenOutsideRange?: boolean): string;
     /**