egovamap 0.15.18 → 0.15.19

package/egovamap/egovagis.js

@@ -143,7 +143,12 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 				}
 				that.$gisMapFrame.src = url;
 				that.$gisMapFrame.onload = function(){
-					that.$gisMapFrame.contentWindow.postMessage(gisServerURL, "*");
+					if(!this.contentDocument.documentElement.getElementsByTagName("head").item(0).outerHTML.includes("/library/egovagis/map/map.js")) {
+						var mainScript = this.contentDocument.createElement("script");
+						mainScript.setAttribute("type", "text/javascript");
+						mainScript.setAttribute("src", gisServerURL + "/library/egovagis/map/map.js");
+						this.contentDocument.documentElement.getElementsByTagName("head").item(0).appendChild(mainScript);
+					}
 				}
 			});
 			try {
@@ -186,6 +191,14 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 						}
 					}
 					that.$gisMapFrame.src = url;
+					that.$gisMapFrame.onload = function(){
+						if(!this.contentDocument.documentElement.getElementsByTagName("head").item(0).outerHTML.includes("/library/egovagis/map/map.js")) {
+							var mainScript = this.contentDocument.createElement("script");
+							mainScript.setAttribute("type", "text/javascript");
+							mainScript.setAttribute("src", gisServerURL + "/library/egovagis/map/map.js");
+							this.contentDocument.documentElement.getElementsByTagName("head").item(0).appendChild(mainScript);
+						}
+					}
 				});
 				try {
 					//如果启用了实景功能需要注册实景监听，msgPrefix+'old'，为了兼容以前的GIS实景结合

package/egovamap/egovaglobe.js

@@ -131,12 +131,12 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
 						}
 						that.$globeMapFrame.src = globeMapUrl;
 						that.$globeMapFrame.onload = function(){
-							// that.$globeMapFrame.contentWindow.postMessage(globeConfig.globeServerURL, "*");
-
-							var mainScript = this.contentDocument.createElement("script");
-							mainScript.setAttribute("type", "text/javascript");
-							mainScript.setAttribute("src", serverURL + "/library/globe/api/initGlobe.js");
-							this.contentDocument.documentElement.getElementsByTagName("head").item(0).appendChild(mainScript);
+							if(!this.contentDocument.documentElement.getElementsByTagName("head").item(0).outerHTML.includes("initGlobe.js")) {
+								var mainScript = this.contentDocument.createElement("script");
+								mainScript.setAttribute("type", "text/javascript");
+								mainScript.setAttribute("src", serverURL + "/library/globe/api/initGlobe.js");
+								this.contentDocument.documentElement.getElementsByTagName("head").item(0).appendChild(mainScript);
+							}
 						}
 				}
 			}
@@ -249,6 +249,14 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
 						}
 					}
 					that.$globeMapFrame.src=globeMapUrl;
+					that.$globeMapFrame.onload = function(){
+						if(!this.contentDocument.documentElement.getElementsByTagName("head").item(0).outerHTML.includes("initGlobe.js")) {
+							var mainScript = this.contentDocument.createElement("script");
+							mainScript.setAttribute("type", "text/javascript");
+							mainScript.setAttribute("src", serverURL + "/library/globe/api/initGlobe.js");
+							this.contentDocument.documentElement.getElementsByTagName("head").item(0).appendChild(mainScript);
+						}
+					}
 				}
 				checkGlobeServerURL(context.globeServerURL || context.gisServerURL, function(serverURL) {
 					context.globeServerURL = serverURL;
@@ -1892,6 +1900,51 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
             return;
         scene.fire((msgPrefix + ":controlCamera"), { args: [options] }, parentScene, false);
     };
+    that.zoomIn = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":zoomIn"), { args: [] }, parentScene, false);
+    };
+    that.zoomOut = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":zoomOut"), { args: [options] }, parentScene, false);
+    };
+    that.measureDistance = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":measureDistance"), { args: [options] }, parentScene, false);
+    };
+    that.measureArea = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":measureArea"), { args: [options] }, parentScene, false);
+    };
+    that.measureHeight = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":measureHeight"), { args: [options] }, parentScene, false);
+    };
+    that.onUndergroundModel = function(alpha, distance) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":onUndergroundModel"), { args: [alpha, distance] }, parentScene, false);
+    };
+    that.offUndergroundModel = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":offUndergroundModel"), { args: [] }, parentScene, false);
+    };
+    that.addFlag = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":addFlag"), { args: [options] }, parentScene, false);
+    };
+    that.getPointInfo = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":getPointInfo"), { args: [options] }, parentScene, false);
+    };
 
 	that.init();
 };

package/egovamap/egovamap.js

@@ -3791,6 +3791,70 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
             globeMap.controlCamera(options);
         }
     };
+    that.zoomIn = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.zoomIn();
+        }
+    };
+    that.zoomOut = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.zoomOut();
+        }
+    };
+
+    that.measureDistance = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.measureDistance();
+        }
+    };
+    that.measureArea = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.measureArea();
+        }
+    };
+    that.measureHeight = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.measureHeight();
+        }
+    };
+    that.onUndergroundModel = function(alpha, distance) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.onUndergroundModel(alpha, distance);
+        }
+    };
+    that.offUndergroundModel = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.offUndergroundModel();
+        }
+    };
+    that.addFlag = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.addFlag(options);
+        }
+    };
+    that.getPointInfo = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.getPointInfo(options);
+        }
+    };
 
 	that.initMap(containerID, callback, mapType, mapConfig);
 

package/package.json

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