egovamap 0.15.17 → 0.15.18

package/egovamap/egovagis.js

@@ -565,24 +565,24 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		scene.fire((msgPrefix + ":showPatrolCurrentPosition"), { args: args }, parentScene, false);
 	}
 	/* 获取缓冲区 */
-			that.getBuffer = function (layerID, x, y, radius,getBufferCallback) {
-				if (scene == null)
-					return;
-
-				var args = Array.prototype.slice.call(arguments);
-				if (arguments[arguments.length - 1] instanceof Function) {
-					getBufferCallback = arguments[arguments.length - 1];
-					args = args.slice(0, args.length - 1);
-				}
+	that.getBuffer = function (layerID, x, y, radius,getBufferCallback) {
+		if (scene == null)
+			return;
 
-				if (getBufferCallback) {
-					that.removeEventBind("getBufferCallback");
-					that.bindEvent("getBufferCallback", function (evt) {
-						getBufferCallback(evt.args);
-					});
-				}
-				scene.fire((msgPrefix + ":getBuffer"), {args: args}, parentScene, true);
-			}
+		var args = Array.prototype.slice.call(arguments);
+		if (arguments[arguments.length - 1] instanceof Function) {
+			getBufferCallback = arguments[arguments.length - 1];
+			args = args.slice(0, args.length - 1);
+		}
+
+		if (getBufferCallback) {
+			that.removeEventBind("getBufferCallback");
+			that.bindEvent("getBufferCallback", function (evt) {
+				getBufferCallback(evt.args);
+			});
+		}
+		scene.fire((msgPrefix + ":getBuffer"), {args: args}, parentScene, true);
+	}
 	/* 获取多点的缓冲区 */
 	that.getMultiPointBuffer = function(points, radius){
 		if (scene == null)
@@ -590,6 +590,18 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		scene.fire((msgPrefix + ":getMultiPointBuffer"), {args: args}, parentScene, true);
 
 	}
+	/**
+	 * 设置指定图层的样式
+	 * @param  id 元素的id
+	 * @param  tag 图层的标签
+	 * @param  style 图层样式
+	 * @returns 
+	 */
+	that.setGraphicStyle = function(id, tag, style){
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":setGraphicStyle"), {args: args}, parentScene, true);
+	}
 	/* 显示监督员责任网格 */
 	that.showPatrolDutygridCells = function(infoJson, zoom, clickCallback) {
 		if (scene == null)

package/egovamap/egovaglobe.js

@@ -131,7 +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, "*");
+							// 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);
 						}
 				}
 			}
@@ -1862,6 +1867,31 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
             return;
         scene.fire((msgPrefix + ":getMapConfig"), {args: [key, callback]}, parentScene, false);
     };
+	    that.addCIMMap = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":addCIMMap"), { args: [options] }, parentScene, false);
+    };
+    that.addCIMModel = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":addCIMModel"), { args: [options] }, parentScene, false);
+    };
+    that.setLayerVisible = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":setLayerVisible"), { args: [options] }, parentScene, false);
+    };
+    that.flyToLayer = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":flyToLayer"), { args: [options] }, parentScene, false);
+    };
+    that.controlCamera = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":controlCamera"), { args: [options] }, parentScene, false);
+    };
 
 	that.init();
 };

package/egovamap/egovamap.js

@@ -1804,7 +1804,14 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		if (gisMap != null)
 			gismap.getMultiPointBuffer(this, arguments);
 	}
-
+	that.setGraphicStyle = function(id, tag, style){
+		if (scene == null){
+			return;
+		}
+		if(gisMap!=null){
+			gisMap.setGraphicStyle(this, arguments);
+		}
+	}
 	/* 显示监督员责任网格 */
 	that.showPatrolDutygridCells = function (infoJson, zoom, clickCallback) {
 		if (scene == null)
@@ -3747,7 +3754,43 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 			gisMap.clearLayerSelectStyle.apply(this, arguments);
 		}
 	}
+    //添加影像wms、wmts等
+    that.addCIMMap = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.addCIMMap(options);
+        }
+    }
+    that.addCIMModel = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.addCIMModel(options);
+        }
+    };
+    that.setLayerVisible = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.setLayerVisible(options);
+        }
+    };
 
+    that.flyToLayer = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.flyToLayer(options);
+        }
+    };
+    that.controlCamera = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.controlCamera(options);
+        }
+    };
 
 	that.initMap(containerID, callback, mapType, mapConfig);
 

package/package.json

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