egovamap 0.18.4 → 0.19.0

package/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:8080",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}

package/egovamap/egovaBI.js

@@ -693,6 +693,9 @@ var egovaBI = function(globeMap, gisMap, mapType){
             }
         }
     }
+    this.cancelHighlightedRegion=function(layerName){
+        globeMap.cancelHighlightedRegion(layerName);
+    }
     /*
      * @description:新参数格式的旧线接口，主要用来做中间层参数格式转换
      * @method showPolyline_BI
@@ -902,7 +905,8 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     minZoom: options.visiblitySetting.beginLevel,
                     maxZoom: options.visiblitySetting.endLevel,
                     layerId: options.layerName,
-                    comCallbak: callback
+                    comCallbak: callback,
+                    order: options.order
                     // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
                 },
                 options.layerName, // layerTag
@@ -923,7 +927,8 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     {
                         minZoom: options.visiblitySetting.beginLevel,
                         maxZoom: options.visiblitySetting.endLevel,
-                        layerId: options.layerName
+                        layerId: options.layerName,
+                        order: options.order
                         // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
                     },
                     options.layerName, // layerTag
@@ -949,7 +954,8 @@ var egovaBI = function(globeMap, gisMap, mapType){
                       minZoom: options.visiblitySetting.beginLevel,
                       maxZoom: options.visiblitySetting.endLevel,
                       layerId: options.layerName,
-                      comCallbak: callback
+                      comCallbak: callback,
+                      order: options.order
                       // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
                   },
                   options.layerName, // layerTag

package/egovamap/egovagis.js

@@ -462,6 +462,26 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		}
 		scene.fire(msgPrefix + ":getAddressByXY", { args : [ x, y, searchStr, radius ] }, parentScene);
 	}
+	that.getGaAddressByXY = function(x, y, options, callback) {
+		if (scene == null) return;
+		if(callback) {
+			that.removeEventBind("getGaAddressByXYCallback");
+			that.bindEvent("getGaAddressByXYCallback", function (evt) {
+				callback(evt.args);
+			});
+		}
+		scene.fire(msgPrefix + ":getGaAddressByXY", { args : [ x, y, options ] }, parentScene);
+	}
+	that.getGaStandardAddress = function(params, callback) {
+		if (scene == null) return;
+		if(callback) {
+			that.removeEventBind("getGaStandardAddressCallbackCallback");
+			that.bindEvent("getGaStandardAddressCallbackCallback", function (evt) {
+				callback(evt.args);
+			});
+		}
+		scene.fire(msgPrefix + ":getGaStandardAddress", { args : [ params ] }, parentScene);
+	}
 	/* 根据坐标获取单元网格 */
 	that.getCellNameByPosXY = function(x, y, gridType) {
 		if (scene == null)
@@ -744,7 +764,73 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		scene.fire(msgPrefix + ":updatePlaySpeed", { args: [value] },
 			parentScene);
 	}
-    
+
+	that.startRealtimeTrace = function (groupIDs, objectIDs, objectType, resourceType, uiOption, traceOption, jobOption, options) {
+		if (scene == null)
+			return;
+
+		var groupIDStrs = "";
+		if (groupIDs instanceof Array && groupIDs.length > 0) {
+			for (var i = 0; i < groupIDs.length; i++) {
+				if (i != groupIDs.length - 1) {
+					groupIDStrs += "comp_" + groupIDs[i] + ","
+				} else {
+					groupIDStrs += "comp_" + groupIDs[i];
+				}
+			}
+		}
+
+		var objectIDStrs = "";
+		if (objectIDs instanceof Array && objectIDs.length > 0 && groupIDs instanceof Array && groupIDs.length > 0) {
+			for (var i = 0; i < groupIDs.length; i++) {
+				for (var j = 0; j < objectIDs.length; j++) {
+					if (j != objectIDs.length - 1) {
+						objectIDStrs += groupIDs[i] + "_" + objectIDs[j] + ",";
+					} else {
+						objectIDStrs += groupIDs[i] + "_" + objectIDs[j];
+					}
+
+				}
+			}
+		}
+		// 监听
+		if (!options) options = {};
+		if (typeof options.MultiTraceDataCallback === 'function') {
+			that.removeEventBind("MultiTraceDataCallback");
+			that.bindEvent("MultiTraceDataCallback", function (evt) {
+				options.MultiTraceDataCallback(evt && evt.args);
+			});
+		}
+
+		if (typeof options.mouseOverCallback === 'function') {
+			that.removeEventBind("MultiTraceMouseOver");
+			that.bindEvent("MultiTraceMouseOver", function (evt) {
+				options.mouseOverCallback(evt && evt.args);
+			});
+		}
+		if (typeof options.mouseOutCallback === 'function') {
+			that.removeEventBind("MultiTraceMouseOut");
+			that.bindEvent("MultiTraceMouseOut", function (evt) {
+				options.mouseOutCallback(evt && evt.args);
+			});
+		}
+		if (typeof options.clickCallback === 'function') {
+			that.removeEventBind("MultiTraceClick");
+			that.bindEvent("MultiTraceClick", function (evt) {
+				options.clickCallback(evt && evt.args);
+			});
+		}
+		scene.fire(msgPrefix + ":startRealtimeTrace", { args: [groupIDStrs, objectIDStrs, objectType, resourceType, uiOption, traceOption, jobOption] },
+			parentScene);
+	}
+
+	that.stopRealtimeTrace = function(){
+		if (scene == null)
+			return;
+			
+		scene.fire(msgPrefix + ":stopRealtimeTrace", { args: [] },
+			parentScene);
+	}
     /**
 	*停止绘制要素
 	**/

package/egovamap/egovagisviewer.js

@@ -497,6 +497,13 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         scene.remove(msgPrefix + ":" + msgId, parentScene, stopOnTop);
     }
 
+    /* 切换到平移工具 */
+    that.reorderLayer = function (id, order, options) {
+        if (scene == null)
+            return;
+        that.callMap('reorderLayer', id, order, options);
+    }
+
     /* 切换到平移工具 */
     that.panMap = function () {
         if (scene == null)
@@ -966,10 +973,10 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
             return;
         that.callMap('showMapLayers', layerTag, showLevel, mode, styles);
     }
-    that.showWMSLayer = function (layerUsageID, IDs, keyField, geometry, where, layerName) {
+    that.showWMSLayer = function (layerUsageID, IDs, keyField, geometry, where, layerName, options) {
         if (scene == null)
             return;
-        that.callMap('showWMSLayer', layerUsageID, IDs, keyField, geometry, where, layerName);
+        that.callMap('showWMSLayer', layerUsageID, IDs, keyField, geometry, where, layerName, options);
     }
     that.removeWMSLayerId = function (layerId, options) {
         if (scene == null)

package/egovamap/egovaglobe.js

@@ -1837,6 +1837,11 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
         if (scene == null)
             return;
         scene.fire((msgPrefix + ":regionOperation"), {args: [options, data]}, parentScene, false);
+    };
+	that.cancelHighlightedRegion = function(layerName){
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":cancelHighlightedPrimitive"), {args: [layerName]}, parentScene, false);
     };
 	that.activeLayer = function(layerName, options, filter){
         if (scene == null)

package/egovamap/egovamap.js

@@ -386,6 +386,14 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 
 	}
 
+	that.reorderLayer = function (id, order, options) {
+		if (scene == null)
+			return;
+		if (gisMap != null) {
+			gisMap.reorderLayer(id, order, options);
+		}
+	}
+
 
 	/* 切换到平移工具 */
 	that.panMap = function () {
@@ -573,7 +581,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 
 
 	/*添加WMS服务图层*/
-	that.showWMSLayer = function (layerUsageID, IDs, keyField, geometry, where, layerName) {
+	that.showWMSLayer = function (layerUsageID, IDs, keyField, geometry, where, layerName, options) {
 		if (scene == null)
 			return;
 		if (gisMap != null) {
@@ -964,7 +972,18 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 			gisMap.getAddressByXY.apply(this, arguments);
 		}
 	};
-
+	that.getGaAddressByXY = function (x, y, options, callback) {
+		if (scene == null) return;
+		if (gisMap != null) {
+			gisMap.getGaAddressByXY.apply(this, arguments);
+		}
+	};
+	that.getGaStandardAddress = function (params, callback) {
+		if (scene == null) return;
+		if (gisMap != null) {
+			gisMap.getGaStandardAddress.apply(this, arguments);
+		}
+	};
 	/* 根据坐标获取单元网格 */
 	that.getCellNameByPosXY = function (x, y, gridType) {
 		if (scene == null)
@@ -2004,6 +2023,22 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
         }
     }
 
+	that.startRealtimeTrace = function(groupIDs,objectIDs,objectType,resourceType,uiOption,traceOption,jobOption,options){
+		if (scene == null)
+			return;
+		if (gisMap != null&& gisMap.gisVisible) {
+			gisMap.startRealtimeTrace.apply(this, arguments);
+        }
+    }
+
+	that.stopRealtimeTrace = function(){
+		if (scene == null)
+			return;
+		if (gisMap != null&& gisMap.gisVisible) {
+			gisMap.stopRealtimeTrace.apply(this, arguments);
+        }
+    }
+
 	that.checkObjectTraceItem = function(name,visible){
 		if (scene == null)
 			return;

package/package.json

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