egovamap 0.15.14 → 0.15.17

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);
+			});
+		}
+		if(mouseOutCallback instanceof Function){
+			that.bindEvent(mouseOutBackName, function(evt) {
+				mouseOutCallback(evt.args);
 			});
 		}
-		scene.fire((msgPrefix + ":showMultiObjectCurrentPosition"), {args: args}, parentScene, false);
+		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) {

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];
@@ -1785,48 +1773,52 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         };
         that.callMap('getCenterPoint', polygon, cb);
     }
-	
-	/*设置图层显示与隐藏*/
+
+    /*设置图层显示与隐藏*/
     that.setLayerVisible = function (name, visible) {
         if (scene == null)
             return;
-       
+
         that.callMap('setLayerVisible', name, visible);
     }
 
-    that.removeWMSLayer = function(layerName){
+    that.removeWMSLayer = function (layerName) {
         if (scene == null)
             return;
-       
+
         that.callMap('removeWMSLayer', layerName);
     }
-	
-	that.getMainSubTypeTree = function (params, callback) {
-		if (scene == null)
-			return;
-		var cb = function (type, data) {
-			if (callback && type == 'getMainSubTypeTreeCallback') {
-				callback(data);
-			}
-		};
-		that.callMap('getMainSubTypeTree', params, cb);
-	}
 
-	that.getRegion = function (params, callback) {
-		if (scene == null)
-			return;
-		var cb = function (type, data) {
-			if (callback && type == 'getRegionCallback') {
-				callback(data);
-			}
-		};
-		that.callMap('getRegion', params, cb);
-	}
+    that.getMainSubTypeTree = function (params, callback) {
+        if (scene == null)
+            return;
+        var cb = function (type, data) {
+            if (callback && type == 'getMainSubTypeTreeCallback') {
+                callback(data);
+            }
+        };
+        that.callMap('getMainSubTypeTree', params, cb);
+    }
+
+    that.getRegion = function (params, callback) {
+        if (scene == null)
+            return;
+        var cb = function (type, data) {
+            if (callback && type == 'getRegionCallback') {
+                callback(data);
+            }
+        };
+        that.callMap('getRegion', params, cb);
+    }
 
-    that.getMapConfig = function(key, callback){
+    that.getMapConfig = function (key, callback) {
         that.callMap('getMapConfig', key, callback);
     }
 
+    that.clearLayerSelectStyle = function (id, options) {
+        that.callMap('clearLayerSelectStyle', id, options);
+    }
+
     that.init();
 }
 

package/egovamap/egovaglobe.js

@@ -130,6 +130,9 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
 							}
 						}
 						that.$globeMapFrame.src = globeMapUrl;
+						that.$globeMapFrame.onload = function(){
+							that.$globeMapFrame.contentWindow.postMessage(globeConfig.globeServerURL, "*");
+						}
 				}
 			}
 		  	//callback && callback();

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) {
@@ -3729,10 +3729,10 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	}
 
 	//获取GIS配置
-	that.getMapConfig = function(key, callback){
+	that.getMapConfig = function (key, callback) {
 		if (scene == null)
 			return;
-		if(globeMap != null) {
+		if (globeMap != null) {
 			return globeMap.getMapConfig(key, callback)
 		}
 		if (gisMap != null) {
@@ -3740,6 +3740,14 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		}
 	}
 
+	that.clearLayerSelectStyle = function (id, options) {
+		if (scene == null)
+			return;
+		if (gisMap != null) {
+			gisMap.clearLayerSelectStyle.apply(this, arguments);
+		}
+	}
+
 
 	that.initMap(containerID, callback, mapType, mapConfig);
 

package/package.json

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