egovamap 0.15.18 → 0.15.21

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实景结合
@@ -618,7 +631,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		that.locateFeatureByIDs(layerID, layerKeyFieldName, cellID, bClearMap, gridCellStyle.style, gridCellStyle.hStyle, zoom);
 	}
 	/* 标识位置 */
-	that.markMap = function(projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName,point) {
+	that.markMap = function(projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName,point,symbolUrl) {
 		if (scene == null)
 			return;
 
@@ -637,8 +650,8 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 			});
 		}
 		scene.fire(msgPrefix + ":markMap", {
-			args : [ projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, cellIndexName,point]
-		}, parentScene, false);
+			args : [ projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, cellIndexName,point, symbolUrl]
+		  }, parentScene, false);
 	}
 	/* 案件定位 */
 	that.eventLocate = that.recLocate = function(eventID, defaultMapRange) {

package/egovamap/egovagisviewer.js

@@ -928,7 +928,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         that.callMap('locateFeatureByIDs', layerID, layerKeyFieldName, cellID, bClearMap, gridCellStyle.style, gridCellStyle.hStyle, zoom);
     }
     /* 标识位置 */
-    that.markMap = function (projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName, point, option, symbolUrl) {
+    that.markMap = function (projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName, point, symbolUrl) {
         if (scene == null)
             return;
 

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,7 +1900,171 @@ 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.addClusterLayerCIM = function(dataInfo, option) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":addClusterLayer"), { args: [dataInfo, option] }, parentScene, false);
+    };
+	//可视域分析	
+	that.startViewer = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":startViewer"), { args: [options] }, parentScene, false);
+    };
+	that.removeViewer = function() {
+	    if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":removeViewer"), { args: [] }, parentScene, false);
+    };
+    that.setViewerOptions = function(options) {
+	    if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":setViewerOptions"), { args: [options] }, parentScene, false);
+    };
+    that.showSkyLine = function(options) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":showSkyLine"), { args: [options] }, parentScene, false);
+    };
+	that.clearSkyLine = function() {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":clearSkyLine"), { args: [] }, parentScene, false);
+    };
+    that.setLineOptions = function(options) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":setLineOptions"), { args: [options] }, parentScene, false);
+    };
+	that.bufferAnalysis = function(options,clear,update) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":bufferAnalysis"), { args: [options,clear,update] }, parentScene, false);
+    };
+    that.clearBufferAnalysis = function(options) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":clearBufferAnalysis"), { args: [] }, parentScene, false);
+    };
+    that.addModelClickEvent = function(callback) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":addModelClickEvent"), { args: [callback] }, parentScene, false);
+    };
+    that.removeModelClickEvent = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":removeModelClickEvent"), { args: [] }, parentScene, false);
+    };
+    that.getBIMTree = function(option, callback) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":getBIMTree"), { args: [option, callback] }, parentScene, false);
+    };
+    that.setBIMTree = function(option) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":setBIMTree"), { args: [option] }, parentScene, false);
+    };
+    that.clearBimSelect = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":clearBimSelect"), { args: [] }, parentScene, false);
+    };
+    that.visibilityAnalysis = function(type) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":visibilityAnalysis"), { args: [type] }, parentScene, false);
+    };
+    that.clearVisibilityAnalysis = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":clearVisibilityAnalysis"), { args: [] }, parentScene, false);
+    };
+    that.addCIMTerrain = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":addCIMTerrain"), { args: [options] }, parentScene, false);
+    };
+    that.flytoPosition = function(lon, lat, height) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":flytoPosition"), { args: [lon, lat, height] }, parentScene, false);
+    };
+    //开启日照分析
+    that.openSunshineAnalysis = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":openSunshineAnalysis"), { args: [] }, parentScene, false);
+    };
+    that.sunshineAnalysis = function(date) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":sunshineAnalysis"), { args: [date] }, parentScene, false);
+    };
+    that.closeSunshineAnalysis = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":closeSunshineAnalysis"), { args: [] }, parentScene, false);
+    };
+    //设置天气
+    that.setViewConfig = function(type, options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":setViewConfig"), { args: [type, options] }, parentScene, false);
+    };
+	//管网高亮显示
+    that.searchAndShowPipe = function(url, options, color, clear) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":searchAndShowPipe"), { args: [url, options, color, clear] }, parentScene, false);
+    };
 	that.init();
 };
 

package/egovamap/egovamap.js

@@ -1822,7 +1822,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	}
 
 	/* 标识位置 */
-	that.markMap = function (projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName, point) {
+	that.markMap = function (projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName, point, symbolUrl) {
 		if (scene == null)
 			return;
 		if (gisMap != null && gisMap.gisVisible) {
@@ -3791,7 +3791,237 @@ 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.addClusterLayerCIM = function(dataInfo, option) {
+        if (scene == null)
+            return;
+
+        if (globeMap != null) {
+            globeMap.addClusterLayerCIM(dataInfo, option);
+        }
+    };
+	//可视域分析
+	that.startViewer = function(options) {
+	    if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.startViewer(options);
+		}
+    };
+	that.removeViewer = function() {
+	    if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.removeViewer();
+		}
+    };
+    that.setViewerOptions = function(options) {
+	    if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.setViewerOptions(options);
+		}
+    };
+    that.showSkyLine = function(options) {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.showSkyLine(options);
+		}
+    };
+    that.clearSkyLine = function() {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.clearSkyLine();
+		}
+    };  
+    that.setLineOptions = function(options) {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.setLineOptions(options);
+		}
+    };
+    that.bufferAnalysis = function(options,clear,update) {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.bufferAnalysis(options,clear,update);
+		}
+    };  
+    that.clearBufferAnalysis = function() {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.clearBufferAnalysis();
+		}
+    };	
+    that.addModelClickEvent = function(callback) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.addModelClickEvent(callback);
+        }
+    };
+    that.removeModelClickEvent = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.removeModelClickEvent();
+        }
+    };
+    that.getBIMTree = function(options, callback) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.getBIMTree(options, callback);
+        }
+    };
+    that.setBIMTree = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.setBIMTree(options);
+        }
+    };
+    that.clearBimSelect = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.clearBimSelect();
+        }
+    };
+    that.visibilityAnalysis = function(type) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.visibilityAnalysis(type);
+        }
+    };
+    that.clearVisibilityAnalysis = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.clearVisibilityAnalysis();
+        }
+    };
+    that.addCIMTerrain = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.addCIMTerrain(options);
+        }
+    }
+    that.flytoPosition = function(lon, lat, height) {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.flytoPosition(lon, lat, height);
+		}
+	};
+	//开启日照分析
+    that.openSunshineAnalysis = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.openSunshineAnalysis();
+        }
+    };
+    that.sunshineAnalysis = function(date) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.sunshineAnalysis(date);
+        }
+    };
+    that.closeSunshineAnalysis = function() {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.closeSunshineAnalysis();
+		}
+	};
+	//设置天气
+    that.setViewConfig = function(type, options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.setViewConfig(type, options);
+        }
+    };
+	//管网高亮显示
+    that.searchAndShowPipe = function(url, options, color, clear) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.searchAndShowPipe(url, options, color, clear);
+        }
+    };		
 	that.initMap(containerID, callback, mapType, mapConfig);
 
 	// EGovaBI(globeMap).bind(this)();

package/package.json

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