egovamap 0.35.67 → 0.35.69

package/egovamap/egovagisviewer.js

@@ -91,6 +91,10 @@ var EGovaGISMap = function (
     that.gisVisible = false;
     that.gisLoaded = false;
     that.isLoading = false;
+    that._boundGlobalCallback = null;
+    that._viewerScript = null;
+    that._viewerLink = null;
+    that._handleViewerScriptLoad = null;
 
     //that.$gisMapFrame = null;
     that.gisMapContainer = null;
@@ -389,6 +393,7 @@ var EGovaGISMap = function (
         mainLink.setAttribute("href", cssUrl);
         mainLink.setAttribute("rel", "stylesheet");
         document.getElementsByTagName("head").item(0).appendChild(mainLink);
+        that._viewerLink = mainLink;
 
         var url =
             gisServerURL +
@@ -406,7 +411,11 @@ var EGovaGISMap = function (
         if(context.initJSAsync) { // 初始化JS是否同步加载
             mainScript.setAttribute("async", false);
         }
-        mainScript.onload = that.createMap.bind(that);
+        that._handleViewerScriptLoad = function () {
+            return that.createMap();
+        };
+        mainScript.onload = that._handleViewerScriptLoad;
+        that._viewerScript = mainScript;
         document.getElementsByTagName("head").item(0).appendChild(mainScript);
     };
 
@@ -2608,7 +2617,47 @@ var EGovaGISMap = function (
     };
 
     that.destroyMap = function () {
+        var currentMap = window.eMapList && window.eMapList[that.id];
         that.callMap("destroyMap");
+        if (that._viewerScript) {
+            that._viewerScript.onload = null;
+            that._viewerScript.onerror = null;
+            that._viewerScript.remove();
+            that._viewerScript = null;
+        }
+        if (that._viewerLink) {
+            that._viewerLink.remove();
+            that._viewerLink = null;
+        }
+        if (window.eMapList && window.eMapList[that.id]) {
+            window.eMapList[that.id] = null;
+            delete window.eMapList[that.id];
+        }
+        if (currentMap && currentMap.egovagis) {
+            currentMap.egovagis.fireCallback = null;
+            currentMap.egovagis.fireErrorCallback = null;
+            currentMap.egovagis.reconfigMap = null;
+            currentMap.egovagis.eMap = null;
+            currentMap.egovagis.global = null;
+            currentMap.egovagis.sysConfig = null;
+        }
+        if (that.callbackList) {
+            Object.keys(that.callbackList).forEach(function (key) {
+                that.callbackList[key] = null;
+                delete that.callbackList[key];
+            });
+        }
+        if (that.onMapLoadedHandlers) {
+            that.onMapLoadedHandlers.length = 0;
+        }
+        that._handleViewerScriptLoad = null;
+        that._boundGlobalCallback = null;
+        that.globalCallback = function () {};
+        that.fireCallback = function () {};
+        that.gisMapContainer = null;
+        that.globeMapContainer = null;
+        that.gisLoaded = false;
+        that.isLoading = false;
     };
 
     that.switchGisMapType = function (type, callback) {
@@ -2853,7 +2902,47 @@ var EGovaGISMap = function (
     }
 	
     that.destroyMap = function () {
+        var currentMap = window.eMapList && window.eMapList[that.id];
         that.callMap("destroyMap");
+        if (that._viewerScript) {
+            that._viewerScript.onload = null;
+            that._viewerScript.onerror = null;
+            that._viewerScript.remove();
+            that._viewerScript = null;
+        }
+        if (that._viewerLink) {
+            that._viewerLink.remove();
+            that._viewerLink = null;
+        }
+        if (window.eMapList && window.eMapList[that.id]) {
+            window.eMapList[that.id] = null;
+            delete window.eMapList[that.id];
+        }
+        if (currentMap && currentMap.egovagis) {
+            currentMap.egovagis.fireCallback = null;
+            currentMap.egovagis.fireErrorCallback = null;
+            currentMap.egovagis.reconfigMap = null;
+            currentMap.egovagis.eMap = null;
+            currentMap.egovagis.global = null;
+            currentMap.egovagis.sysConfig = null;
+        }
+        if (that.callbackList) {
+            Object.keys(that.callbackList).forEach(function (key) {
+                that.callbackList[key] = null;
+                delete that.callbackList[key];
+            });
+        }
+        if (that.onMapLoadedHandlers) {
+            that.onMapLoadedHandlers.length = 0;
+        }
+        that._handleViewerScriptLoad = null;
+        that._boundGlobalCallback = null;
+        that.globalCallback = function () {};
+        that.fireCallback = function () {};
+        that.gisMapContainer = null;
+        that.globeMapContainer = null;
+        that.gisLoaded = false;
+        that.isLoading = false;
     }	
 
     that.pointInPolygon = function (point, polygon, callback) {

package/egovamap/egovamap.js

@@ -47,6 +47,31 @@ function getMapContainer(container) {
     }
     return result;
 }
+
+function ensureCanvasGetContextPatched() {
+    if (typeof HTMLCanvasElement === 'undefined') {
+        return;
+    }
+
+    var canvasProto = HTMLCanvasElement.prototype;
+    if (canvasProto.__egovamapGetContextPatched) {
+        return;
+    }
+
+    var originalGetContext =
+        canvasProto.__egovamapOriginalGetContext || canvasProto.getContext;
+    canvasProto.__egovamapOriginalGetContext = originalGetContext;
+    canvasProto.getContext = function (type, attributes) {
+        if (type === 'webgl') {
+            attributes = Object.assign({}, attributes, {
+                preserveDrawingBuffer: true,
+            });
+        }
+        return originalGetContext.call(this, type, attributes);
+    };
+    canvasProto.__egovamapGetContextPatched = true;
+}
+
 var EGovaMap = function (
     containerID,
     callback,
@@ -55,6 +80,7 @@ var EGovaMap = function (
     mapParam,
     context
 ) {
+    ensureCanvasGetContextPatched();
     context &&
         !context.assetsPath &&
         (context.assetsPath = '/library/urban/egovamap');
@@ -5577,6 +5603,7 @@ var EGovaMap = function (
         if (scene == null) return;
         if (gisMap && gisMap.destroyMap) {
             gisMap.destroyMap();
+            gisMap = null;
         }
     };
 
@@ -5742,17 +5769,6 @@ var EGovaMap = function (
     EGovaBI.call(this, globeMap, gisMap, mapType);
     gisMobileMap && EgovamapMEx.call(this, gisMobileMap);
 
-    //解决html2canvas截图空白问题
-    HTMLCanvasElement.prototype.getContext = (function (origFn) {
-        return function (type, attributes) {
-            if (type === 'webgl') {
-                attributes = Object.assign({}, attributes, {
-                    preserveDrawingBuffer: true,
-                });
-            }
-            return origFn.call(this, type, attributes);
-        };
-    })(HTMLCanvasElement.prototype.getContext);
 };
 
 var EGovaMapUtils = {
@@ -5805,6 +5821,7 @@ var EGovaMapUtils = {
             for (var i = mapArray.length - 1; i >= 0; i--) {
                 if (mapArray[i] === mapList[uniqueID]) {
                     mapArray[i].destroyMap();
+                    mapArray[i] = null;
                     delete mapArray[i];
                     break;
                 }
@@ -5825,12 +5842,16 @@ var EGovaMapUtils = {
                 }
             }
         }
-
         if(window && window.eMapList){
-            const mapId = uniqueID+ '_gis_map';
+            const mapId = uniqueID+ '_gis_emap';
             if(window.eMapList[mapId]){
+                window.eMapList[mapId] = null;
                 delete window.eMapList[mapId];
             }
+            if(window[mapId]){
+                window[mapId] = null;
+                delete window[mapId];
+            }
         }
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egovamap",
-  "version": "0.35.67",
+  "version": "0.35.69",
   "description": "eUrbanGIS SDK",
   "main": "index.js",
   "scripts": {