@opengeoweb/webmap 4.7.1 → 4.8.0

package/index.esm.js

@@ -4003,7 +4003,6 @@ var version = '3.0.1';
 /* Global vars */
 
 var WebMapJSMapNo = 0;
-var WebMapJSMapInstanceIds = [];
 var bgMapImageStore = new WMImageStore(bgImageStoreLength, {
   id: 'bgMapImageStore'
 });
@@ -4053,6 +4052,8 @@ var WMJSMap = /*#__PURE__*/function () {
 
     _classCallCheck(this, WMJSMap);
 
+    this.internalMapId = '';
+
     this.onContextMenu = function () {
       return false;
     };
@@ -4120,7 +4121,7 @@ var WMJSMap = /*#__PURE__*/function () {
     this.showScaleBarInMap = true;
     this.mouseHoverAnimationBox = false;
     this.callBack = new WMListener();
-    this.initialized = 0;
+    this.initialized = false;
     this.suspendDrawing = false;
     this.activeLayer = undefined;
     /* Undo: */
@@ -4329,25 +4330,12 @@ var WMJSMap = /*#__PURE__*/function () {
     value: function makeComponentId(id) {
       var availableId = "WebMapJSMapNo_".concat(WebMapJSMapNo);
 
-      if (!this.mainElement.id) {
-        for (var testDestroyed in WebMapJSMapInstanceIds) {
-          if (WebMapJSMapInstanceIds[testDestroyed] === false) {
-            availableId = testDestroyed;
-            this.hasGeneratedId = true;
-            break;
-          }
-        }
-
-        this.mainElement.id = availableId;
-        WebMapJSMapInstanceIds[this.mainElement.id] = true;
-      }
-
-      if (this.hasGeneratedId === false) {
-        this.hasGeneratedId = true;
+      if (this.internalMapId === '') {
+        this.internalMapId = availableId;
         WebMapJSMapNo += 1;
       }
 
-      return "".concat(this.mainElement.id, "_").concat(id);
+      return "".concat(this.internalMapId, "_").concat(id);
     }
   }, {
     key: "setMessage",
@@ -4805,8 +4793,7 @@ var WMJSMap = /*#__PURE__*/function () {
       this.bbox.bottom = -90;
       this.bbox.right = 180;
       this.bbox.top = 90;
-      this.srs = 'EPSG:4326';
-      this.setSize(this.mainElement.clientWidth, this.mainElement.clientHeight); // IMAGE buffer
+      this.srs = 'EPSG:4326'; // IMAGE buffer
 
       this.divBuffer = new WMCanvasBuffer(this.callBack, getMapImageStore, this.getWidth(), this.getHeight(), {
         beforecanvasstartdraw: this._adagucBeforeDraw,
@@ -4820,7 +4807,7 @@ var WMJSMap = /*#__PURE__*/function () {
         if (imageEventType === WMImageEventType.Loaded) {
           _this3.draw('legendImageStore loaded');
         }
-      }, this.mainElement.id);
+      }, this.internalMapId);
       this.callBack.addToCallback('display', this.display, true);
       this.callBack.addToCallback('draw', function () {
         debug(DebugType.Log);
@@ -4829,13 +4816,13 @@ var WMJSMap = /*#__PURE__*/function () {
         if (imageEventType === WMImageEventType.Loaded) {
           _this3.draw('bgMapImageStore loaded');
         }
-      }, this.mainElement.id);
+      }, this.internalMapId);
 
       this._updateBoundingBox(this.bbox);
 
       this.wmAnimate = new WMJSAnimate(this);
       this.wmTileRenderer = new WMTileRenderer();
-      this.initialized = 1;
+      this.initialized = true;
     }
   }, {
     key: "rebuildMapDimensions",
@@ -5230,9 +5217,9 @@ var WMJSMap = /*#__PURE__*/function () {
     value: function setSize(w, h) {
       var _this6 = this;
 
-      debug(DebugType.Log);
+      debug(DebugType.Log, 'setSize', w, h, this.initialized);
 
-      if (w < 4 || h < 4) {
+      if (w < 4 || h < 4 || this.initialized === false) {
         return;
       }
 
@@ -5761,6 +5748,7 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
+      if (!this.initialized) return;
       this.stopAnimating();
 
       for (var i = this.layers.length - 1; i >= 0; i -= 1) {
@@ -5769,11 +5757,24 @@ var WMJSMap = /*#__PURE__*/function () {
 
       this.detachEvents();
       this.callBack.destroy();
-      getMapImageStore.removeEventCallback(this.mainElement.id);
-      bgMapImageStore.removeEventCallback(this.mainElement.id);
-      getLegendImageStore().removeEventCallback(this.mainElement.id);
-      WebMapJSMapInstanceIds[this.mainElement.id] = false;
+      this.callBack = null;
+      getMapImageStore.removeEventCallback(this.internalMapId);
+      bgMapImageStore.removeEventCallback(this.internalMapId);
+      getLegendImageStore().removeEventCallback(this.internalMapId);
+      this.internalMapId = '';
+      this.mainElement.removeChild(this.baseDiv);
+      this.baseDiv.innerHTML = '';
+      this.divZoomBox.innerHTML = '';
+      this.divBoundingBox.innerHTML = '';
+      this.divDimInfo.innerHTML = '';
+      this.loadingDiv.innerHTML = '';
+      this.baseDiv = undefined;
+      this.divZoomBox = undefined;
+      this.divBoundingBox = undefined;
+      this.divDimInfo = undefined;
+      this.loadingDiv = undefined;
       this.isDestroyed = true;
+      this.initialized = false;
     }
   }, {
     key: "detachEvents",
@@ -6797,7 +6798,8 @@ var WMJSMap = /*#__PURE__*/function () {
   }, {
     key: "removeListener",
     value: function removeListener(name, f) {
-      return this.callBack.removeEvents(name, f);
+      if (this.isDestroyed) return;
+      this.callBack.removeEvents(name, f);
     }
   }, {
     key: "getListener",

package/index.umd.js

@@ -4059,7 +4059,6 @@
   /* Global vars */
 
   var WebMapJSMapNo = 0;
-  var WebMapJSMapInstanceIds = [];
   var bgMapImageStore = new WMImageStore(bgImageStoreLength, {
     id: 'bgMapImageStore'
   });
@@ -4109,6 +4108,8 @@
     function WMJSMap(_element) {
       var _this = this;
 
+      this.internalMapId = '';
+
       this.onContextMenu = function () {
         return false;
       };
@@ -4176,7 +4177,7 @@
       this.showScaleBarInMap = true;
       this.mouseHoverAnimationBox = false;
       this.callBack = new WMListener();
-      this.initialized = 0;
+      this.initialized = false;
       this.suspendDrawing = false;
       this.activeLayer = undefined;
       /* Undo: */
@@ -4382,25 +4383,12 @@
     WMJSMap.prototype.makeComponentId = function (id) {
       var availableId = "WebMapJSMapNo_" + WebMapJSMapNo;
 
-      if (!this.mainElement.id) {
-        for (var testDestroyed in WebMapJSMapInstanceIds) {
-          if (WebMapJSMapInstanceIds[testDestroyed] === false) {
-            availableId = testDestroyed;
-            this.hasGeneratedId = true;
-            break;
-          }
-        }
-
-        this.mainElement.id = availableId;
-        WebMapJSMapInstanceIds[this.mainElement.id] = true;
-      }
-
-      if (this.hasGeneratedId === false) {
-        this.hasGeneratedId = true;
+      if (this.internalMapId === '') {
+        this.internalMapId = availableId;
         WebMapJSMapNo += 1;
       }
 
-      return this.mainElement.id + "_" + id;
+      return this.internalMapId + "_" + id;
     };
 
     WMJSMap.prototype.setMessage = function (message) {
@@ -4843,8 +4831,7 @@
       this.bbox.bottom = -90;
       this.bbox.right = 180;
       this.bbox.top = 90;
-      this.srs = 'EPSG:4326';
-      this.setSize(this.mainElement.clientWidth, this.mainElement.clientHeight); // IMAGE buffer
+      this.srs = 'EPSG:4326'; // IMAGE buffer
 
       this.divBuffer = new WMCanvasBuffer(this.callBack, getMapImageStore, this.getWidth(), this.getHeight(), {
         beforecanvasstartdraw: this._adagucBeforeDraw,
@@ -4858,7 +4845,7 @@
         if (imageEventType === exports.WMImageEventType.Loaded) {
           _this.draw('legendImageStore loaded');
         }
-      }, this.mainElement.id);
+      }, this.internalMapId);
       this.callBack.addToCallback('display', this.display, true);
       this.callBack.addToCallback('draw', function () {
         debug(exports.DebugType.Log, 'draw event triggered externally, skipping');
@@ -4867,13 +4854,13 @@
         if (imageEventType === exports.WMImageEventType.Loaded) {
           _this.draw('bgMapImageStore loaded');
         }
-      }, this.mainElement.id);
+      }, this.internalMapId);
 
       this._updateBoundingBox(this.bbox);
 
       this.wmAnimate = new WMJSAnimate(this);
       this.wmTileRenderer = new WMTileRenderer();
-      this.initialized = 1;
+      this.initialized = true;
     };
 
     WMJSMap.prototype.rebuildMapDimensions = function () {
@@ -5239,9 +5226,9 @@
     WMJSMap.prototype.setSize = function (w, h) {
       var _this = this;
 
-      debug(exports.DebugType.Log, 'setSize', w, h);
+      debug(exports.DebugType.Log, 'setSize', w, h, this.initialized);
 
-      if (w < 4 || h < 4) {
+      if (w < 4 || h < 4 || this.initialized === false) {
         return;
       }
 
@@ -5748,6 +5735,7 @@
     };
 
     WMJSMap.prototype.destroy = function () {
+      if (!this.initialized) return;
       this.stopAnimating();
 
       for (var i = this.layers.length - 1; i >= 0; i -= 1) {
@@ -5756,11 +5744,24 @@
 
       this.detachEvents();
       this.callBack.destroy();
-      getMapImageStore.removeEventCallback(this.mainElement.id);
-      bgMapImageStore.removeEventCallback(this.mainElement.id);
-      getLegendImageStore().removeEventCallback(this.mainElement.id);
-      WebMapJSMapInstanceIds[this.mainElement.id] = false;
+      this.callBack = null;
+      getMapImageStore.removeEventCallback(this.internalMapId);
+      bgMapImageStore.removeEventCallback(this.internalMapId);
+      getLegendImageStore().removeEventCallback(this.internalMapId);
+      this.internalMapId = '';
+      this.mainElement.removeChild(this.baseDiv);
+      this.baseDiv.innerHTML = '';
+      this.divZoomBox.innerHTML = '';
+      this.divBoundingBox.innerHTML = '';
+      this.divDimInfo.innerHTML = '';
+      this.loadingDiv.innerHTML = '';
+      this.baseDiv = undefined;
+      this.divZoomBox = undefined;
+      this.divBoundingBox = undefined;
+      this.divDimInfo = undefined;
+      this.loadingDiv = undefined;
       this.isDestroyed = true;
+      this.initialized = false;
     };
 
     WMJSMap.prototype.detachEvents = function () {
@@ -6746,7 +6747,8 @@
     };
 
     WMJSMap.prototype.removeListener = function (name, f) {
-      return this.callBack.removeEvents(name, f);
+      if (this.isDestroyed) return;
+      this.callBack.removeEvents(name, f);
     };
 
     WMJSMap.prototype.getListener = function () {

package/lib/components/WMJSMap.d.ts

@@ -59,14 +59,15 @@ export default class WMJSMap {
     private loadedBBOX;
     drawnBBOX: WMBBOX;
     private divBuffer;
-    private isDestroyed;
     private mapHeader;
     private currentCursor;
     private mapIsActivated;
     private isMapHeaderEnabled;
     private showScaleBarInMap;
     private callBack;
-    private initialized;
+    initialized: boolean;
+    isDestroyed: boolean;
+    private internalMapId;
     private suspendDrawing;
     private activeLayer;
     private MaxUndos;

package/package.json

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