@opengeoweb/webmap 19.1.1 → 19.2.0

package/dist/index.esm.js

@@ -1045,25 +1045,8 @@ var WMImage = /*#__PURE__*/function () {
   _proto._setMaxAgeFromResponseHeaders = function _setMaxAgeFromResponseHeaders(response) {
     this._maxAgeSeconds = WMImage._parseMaxAgeFromCacheControl(response.headers.get('cache-control'));
   };
-  _proto._updateMaxAgeFromUrl = function _updateMaxAgeFromUrl(url) {
-    var _this3 = this;
-    fetch(new Request(url), {
-      method: 'GET',
-      mode: 'cors',
-      cache: 'default',
-      headers: new Headers({
-        Range: 'bytes=0-0'
-      })
-    }).then(function (response) {
-      var _response$body;
-      _this3._setMaxAgeFromResponseHeaders(response);
-      void ((_response$body = response.body) == null ? void 0 : _response$body.cancel());
-    })["catch"](function () {
-      // Keep existing behaviour if headers are not readable.
-    });
-  };
   _proto._getImageWithHeaders = function _getImageWithHeaders(url, headers) {
-    var _this4 = this;
+    var _this3 = this;
     var fetchHeaders = new Headers();
     if (headers && headers.length > 0) {
       for (var _iterator = _createForOfIteratorHelperLoose(headers), _step; !(_step = _iterator()).done;) {
@@ -1078,34 +1061,20 @@ var WMImage = /*#__PURE__*/function () {
       cache: 'default'
     };
     var request = new Request(url);
-    var arrayBufferToBase64 = function arrayBufferToBase64(buffer) {
-      var binary = '';
-      var bytes = [].slice.call(new Uint8Array(buffer));
-      bytes.forEach(function (_byte) {
-        binary += String.fromCharCode(_byte);
-      });
-      return window.btoa(binary);
-    };
     fetch(request, options).then(function (response) {
-      _this4._setMaxAgeFromResponseHeaders(response);
-      response.arrayBuffer().then(function (buffer) {
-        var base64Flag = 'data:image/png;base64,';
-        var imageStr = arrayBufferToBase64(buffer);
-        _this4.getElement().src = base64Flag + imageStr;
+      _this3._setMaxAgeFromResponseHeaders(response);
+      response.blob().then(function (imageBlob) {
+        _this3.el.src = URL.createObjectURL(imageBlob);
       })["catch"](function () {
-        debugLogger(DebugType.Error);
-        _this4._loadEvent(true);
+        // Do not log errors, as they are not very useful and can better be inspected via the network console
+        _this3._loadEvent(true);
       });
     })["catch"](function () {
-      debugLogger(DebugType.Error, "Unable to fetch image " + url + " with headers [" + JSON.stringify(headers) + "]");
-      if (url.startsWith('http://')) {
-        debugLogger(DebugType.Error);
-      }
-      _this4._loadEvent(true);
+      // Do not log errors, as they are not very useful and can better be inspected via the network consoles
+      _this3._loadEvent(true);
     });
   };
   _proto._load = function _load() {
-    var _this$headers;
     this._loadStartTime = getCurrentImageTime();
     this._hasError = false;
     if (this._isLoaded) {
@@ -1136,31 +1105,8 @@ var WMImage = /*#__PURE__*/function () {
       this._loadEvent(false);
       return;
     }
-    if ((_this$headers = this.headers) != null && _this$headers.length) {
-      /* Get an image which needs headers */
-      this._getImageWithHeaders(this.srcToLoad, this.headers);
-    } else if (this.randomize) {
-      /* Do a standard img.src url request */
-      this._maxAgeSeconds = null;
-      var newSrc = this.srcToLoad;
-      if (!this.srcToLoad.includes('?')) {
-        newSrc += '?';
-        newSrc += "random=" + Math.random();
-      } else {
-        try {
-          var url = new URL(this.srcToLoad);
-          url.searchParams.set('random', Math.random().toString());
-          newSrc = url.toString();
-        } catch (_unused) {
-          console.warn('failed to randomize url');
-        }
-      }
-      this.getElement().src = newSrc;
-    } else {
-      // Keep the browser image loading path for rendering reliability.
-      this.getElement().src = this.srcToLoad;
-      this._updateMaxAgeFromUrl(this.srcToLoad);
-    }
+    /* Get an image which needs headers */
+    this._getImageWithHeaders(this.srcToLoad, this.headers);
   };
   _proto._loadEvent = function _loadEvent(hasError) {
     var _this$loadEventCallba;
@@ -1172,6 +1118,8 @@ var WMImage = /*#__PURE__*/function () {
     this._srcLoaded = this.srcToLoad;
     this._resolveAll();
     (_this$loadEventCallba = this.loadEventCallback) == null || _this$loadEventCallba.call(this, this);
+    // Free up memory
+    URL.revokeObjectURL(this._srcLoaded);
   };
   _proto.getLoadDuration = function getLoadDuration() {
     return this._loadDuration;

package/dist/src/lib/components/WMImage.d.ts

@@ -96,8 +96,7 @@ export default class WMImage {
     forceReload(randomize?: boolean): void;
     private static _parseMaxAgeFromCacheControl;
     private _setMaxAgeFromResponseHeaders;
-    private _updateMaxAgeFromUrl;
-    private _getImageWithHeaders;
+    _getImageWithHeaders(url: string, headers: WMHeader[]): void;
     _load(): void;
     _loadEvent(hasError: boolean): void;
     getLoadDuration(): number | undefined;

package/package.json

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