egovamap 0.15.15 → 0.15.18

package/egovamap/egovagis.js

@@ -142,6 +142,9 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 					}
 				}
 				that.$gisMapFrame.src = url;
+				that.$gisMapFrame.onload = function(){
+					that.$gisMapFrame.contentWindow.postMessage(gisServerURL, "*");
+				}
 			});
 			try {
 				//如果启用了实景功能需要注册实景监听
@@ -475,7 +478,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 			parentScene);
 	}
 	/* 显示案件分布 */
-	that.showRecListDistribution = function(infoJson, zoom, clickCallback, labelInfo,isShowLegend) {
+	that.showRecListDistribution = function(infoJson, zoom, clickCallback, labelInfo,isShowLegend, symbolUrl, options) {
 		if (scene == null || infoJson.length == 0)
 			return;
 		//如果xy坐标没有值不处理
@@ -493,7 +496,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 				clickCallback(evt.args);
 			});
 		}
-		scene.fire((msgPrefix + ":showRecListDistribution"), { args : [ infoJson, zoom, labelInfo,isShowLegend ] }, parentScene, false);
+		scene.fire((msgPrefix + ":showRecListDistribution"), { args : [ infoJson, zoom, labelInfo,isShowLegend, symbolUrl, options] }, parentScene, false);
 
 		//如果启用了实景功能，同时进行实景定位
 		if(mmsMap && infoJson.length == 1) {
@@ -516,32 +519,31 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		// 移除监听
 		var clickBackName = "showMultiObjectCurrentPositionClick";
 		var mouseOverBackName = "showMultiObjectCurrentPositionMouseover";
-		if(options&&options.callbacksuffix){
+		var mouseOutBackName = "showMultiObjectCurrentPositionMouseout";
+		if (options&&options.callbacksuffix) {
 			clickBackName += options.callbacksuffix;
 			mouseOverBackName += options.callbacksuffix;
+			mouseOutBackName += options.callbacksuffix;
 		}
 		that.removeEventBind(clickBackName);
 		that.removeEventBind(mouseOverBackName);
-		var args =[];
-		var FuncList = [];
-		for(var i = 0;i<arguments.length;i++){
-			 if (arguments[i] instanceof Function) {
-				FuncList.push(arguments[i]);
-			 }else{
-				args.push(arguments[i]);
-			 }
-		}
-		if (FuncList[0] instanceof Function) {
+		that.removeEventBind(mouseOutBackName);
+		if (clickCallback instanceof Function) {
 			that.bindEvent(clickBackName, function(evt) {
-				FuncList[0](evt.args);
+				clickCallback(evt.args);
 			});
 		}
-		if (FuncList[1] instanceof Function) {
+		if (mouseOverCallBack instanceof Function) {
 			that.bindEvent(mouseOverBackName, function(evt) {
-				FuncList[1](evt.args);
+				mouseOverCallBack(evt.args);
 			});
 		}
-		scene.fire((msgPrefix + ":showMultiObjectCurrentPosition"), {args: args}, parentScene, false);
+		if(mouseOutCallback instanceof Function){
+			that.bindEvent(mouseOutBackName, function(evt) {
+				mouseOutCallback(evt.args);
+			});
+		}
+		scene.fire((msgPrefix + ":showMultiObjectCurrentPosition"), {args: [jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clusterOption, hasHover, layerID, options]}, parentScene, false);
 	}
 	/* 显示监督员 */
 	that.showPatrolCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, clickCallback) {
@@ -563,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)
@@ -588,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/egovagisviewer.js

@@ -303,7 +303,6 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         var mainScript = document.createElement('script');
         mainScript.setAttribute('type', 'text/javascript');
         var distOrSource = getLocalStorageItem('gisDebug') ? 'source' : 'dist';
-        distOrSource = 'source';
         var cssUrl = gisServerURL + '/library/egovaviewer/build/' + distOrSource + '/index.css';
         var mainLink = document.createElement('link');
         // mainLink.setAttribute('name','egoavagisviewer_' + uniqueID);
@@ -759,7 +758,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         that.callMap('locateFeatureByIDs', layerID, keyValue, keyFiled, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, outFieldStr, animiteStep, index, clipGeom, cb, popupTemplate);
     }
     /* 显示案件分布 */
-    that.showRecListDistribution = function (infoJson, zoom, clickCallback, labelInfo, isShowLegend, symbolUrl) {
+    that.showRecListDistribution = function (infoJson, zoom, clickCallback, labelInfo, isShowLegend, symbolUrl, options) {
         if (scene == null || infoJson.length == 0)
             return;
         //如果xy坐标没有值不处理
@@ -769,23 +768,12 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
                 return;
             }
         }
-        /*
-        // 移除监听
-        that.removeEventBind("showRecListDistributionCallback");
-
-        if (clickCallback != undefined) {
-        that.bindEvent("showRecListDistributionCallback", function (evt) {
-        clickCallback(evt.args);
-        });
-        }
-        scene.fire((msgPrefix + ":showRecListDistribution"), { args: [infoJson, zoom, labelInfo, isShowLegend] }, parentScene, false);
-         */
-
+		
         var cb = function (type, data) {
             if (clickCallback && type == 'showRecListDistributionCallback')
                 clickCallback(data);
         };
-        that.callMap('showRecListDistribution', infoJson, zoom, labelInfo, isShowLegend, symbolUrl, cb);
+        that.callMap('showRecListDistribution', infoJson, zoom, labelInfo, isShowLegend, symbolUrl, cb, options);
         //如果启用了实景功能，同时进行实景定位
         if (mmsMap && infoJson.length == 1) {
             var recInfo = infoJson[0];

package/egovamap/egovaglobe.js

@@ -130,6 +130,14 @@ 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);
+						}
 				}
 			}
 		  	//callback && callback();
@@ -1859,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

@@ -1638,7 +1638,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		}
 	};
 	/* 显示案件分布 */
-	that.showRecListDistribution = function (infoJson, zoom, clickCallback, labelInfo, isShowLegend) {
+	that.showRecListDistribution = function (infoJson, zoom, clickCallback, labelInfo, isShowLegend, symbolUrl, options) {
 		if (scene == null)
 			return;
 		if (gisMap != null) {
@@ -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.15",
+  "version": "0.15.18",
   "description": "eUrbanGIS SDK",
   "main": "index.js",
   "scripts": {