egovamap 0.18.6 → 0.18.9

package/egovamap/egovagis.js

@@ -764,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

@@ -1863,6 +1863,10 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         that.callMap('activeLayer', layerName, options, filter);
     }
 
+    that.getIntersectFeatures = function(features, options, callback){
+        that.callMap('getIntersectFeatures', features, options, callback);
+    }
+
     that.init();
 }
 

package/egovamap/egovamap.js

@@ -1327,7 +1327,9 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		if (globeMap != null && gisMap != null) {
 			//三维先调用queryFeature查询要素再用locateFeatureByCoords显示
 			var keyvalueWhere = '';
-			if (!keyValue || keyValue.trim() == '' || !keyField || keyField.trim() == '') keyvalueWhere = '1=1'; else {
+			if (!keyValue || keyValue.trim() == '' || !keyField || keyField.trim() == '') 
+				//keyvalueWhere = '1=1'; 
+			else {
 				var whereList = [];
 
 				if (keyValue != null && keyField != null && keyValue != "" && keyField != "") {
@@ -1344,10 +1346,13 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 			var geometry = '';
 			var where = options.where || '1=1';
 			var filterNullGeometry = options.filterNullGeometry;//by cp,2020-08-12,空geometry的过滤
-
+            var queryWhere = where;
+			if(keyvalueWhere != ''){
+				queryWhere = where + " AND " + keyvalueWhere,
+			}
 			var queryParam = {
 				layerID: layerID,
-				where: where + " AND " + keyvalueWhere,
+				where: queryWhere,
 				geometry: geometry,
 				outFields: "*",
 				outGeometry: true,
@@ -2023,6 +2028,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;
@@ -4308,6 +4329,13 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		  gisMap.getLayerUsage(callback);
 		}
 	}
+
+	that.getIntersectFeatures = function(features, options, callback){
+		if (scene == null) { return; }
+		if (gisMap != null) {
+		  gisMap.getIntersectFeatures(features, options, callback);
+		}
+	}
 	
 	that.initMap(containerID, callback, mapType, mapConfig);
 

package/egovamap/egovamapMEx.js

@@ -2,7 +2,7 @@
 var egovamapMEx = function(gisMobileMap){
     
     //常规写法，特殊处理的中间层则类似pc端手动添加
-    var methodEx = ['animateMap','locateFeatureByCoords', 'clearGraphic', 'setGraphicStyle', 'removeMapLayer', 'drawGeometry', 'showRoute', 'clearSelectFeature', 'showWFSLayer', 'showWMSLayer', 'showGridVectorLayer', 'switchBaseLayer', 'clearControl', 'pointSelect', 'queryFeature', 'addPopup', 'setOverlaysVisible', 'removePopup', 'getMapCenter', 'getMapExtent', 'getFullExtent', 'measureArea', 'measureLength', 'clearMap', 'zoomIn', 'zoomOut', 'zoomToExtent', 'zoomToCenter', 'fullExtent', 'getUsageKeyField', 'getPartKeyField', 'buffer', 'setControlOption', 'getAddressList', 'getAddressByXY', 'convertCoords', 'getCenterPoints', 'registerGlobleEvent', 'removeGlobleEvent', 'getExtentByGeoms', 'addMaskLayer', 'getLayerGroupConfig', 'initVectorTile', 'mapDraw', 'setMapDrag', 'setLayerProperty'];
+    var methodEx = ['animateMap','locateFeatureByCoords', 'clearGraphic', 'setGraphicStyle', 'removeMapLayer', 'drawGeometry', 'showRoute', 'clearSelectFeature', 'showWFSLayer', 'showWMSLayer', 'showGridVectorLayer', 'switchBaseLayer', 'clearControl', 'pointSelect', 'queryFeature', 'addPopup', 'setOverlaysVisible', 'removePopup', 'getMapCenter', 'getMapExtent', 'getFullExtent', 'measureArea', 'measureLength', 'clearMap', 'zoomIn', 'zoomOut', 'zoomToExtent', 'zoomToCenter', 'fullExtent', 'getUsageKeyField', 'getPartKeyField', 'buffer', 'setControlOption', 'getAddressList', 'getAddressByXY', 'convertCoords', 'getCenterPoints', 'registerGlobleEvent', 'removeGlobleEvent', 'getExtentByGeoms', 'addMaskLayer', 'getLayerGroupConfig', 'initVectorTile', 'mapDraw', 'setMapDrag', 'setLayerProperty','rotateRrecovery','rotationChangeBack'];
     //业务接口
     var methodBusEx = ['markMap','getCellFieldByXY','getPhyFieldByXY','showMultiObjectCurrentPosition','highLightMultiObjectCurrentPosition','showMultiObjectCurrentPositionCluster','highLightMultiObjectCurrentPositionCluster', 'addHeatMap', 'showGeoLocation', 'showTraceHisLayer', 'clearTraceHisLayer', 'showTraceMultiHisLayer','setTraceMultiState', 'getTraceMultiState', 'traceMultiSelectbyID', 'multiPointsSelectbyID', 'setTraceMultiOptions', 'updateTraceMultiPosition', 'showTraceHisData', 'setTraceState', 'getTraceState', 'setTraceOptions', 'updateTracePosition', 'showTraceSingleLayer', 'traceSingleAppendData', 'hideTraceSingle','setMultiPatrolDynamicPositionOption','showMultiPatrolDynamicPosition','startRealtimeTrace','stopRealtimeTrace','realtimeRrace','stopRealtime','removeRealtimeLayer','getTraceDataInteval', 'queryObjectInfo', 'queryPhylayerFields', 'addControl', 'addMapvLayer', 'removeMapvLayer']
     methodEx = methodEx.concat(methodBusEx);

package/egovamap/egovamobile.js

@@ -196,18 +196,15 @@ var EGovaMobileMap = function ($container, pScene, prefix, gisParams, mapConfig,
         mainScript.onload = that.createMap.bind(that);
         document.getElementsByTagName('head').item(0).appendChild(mainScript);
     }
-
+    /**
+     * enableScaleline、debugTile、useCache、humanID、useMask、token、closeDefaultTool(关闭自带工具)
+     */
     that.createMap = function(){
         var params = {
+            ...context,
             contain: that.id,
             serverURL: context.gisServerURL,
-            enableScaleline: context.enableScaleline,
-            debugTile: context.debugTile,
-            useCache: context.useCache,
-            humanID: context.humanID,
             configName: mapConfig.config,
-            useMask: mapConfig.useMask,
-            token: context.token
         }
         if (!window.eMapList) {
             window.eMapList = {};
@@ -280,7 +277,7 @@ var EGovaMobileMap = function ($container, pScene, prefix, gisParams, mapConfig,
 
     //方法挂载
     //地图接口
-    var methodEx = ['animateMap','locateFeatureByCoords', 'clearGraphic', 'setGraphicStyle', 'removeMapLayer', 'drawGeometry', 'showRoute', 'clearSelectFeature', 'showWFSLayer', 'showWMSLayer', 'showGridVectorLayer', 'switchBaseLayer', 'clearControl', 'pointSelect', 'queryFeature', 'addPopup', 'setOverlaysVisible', 'removePopup', 'getMapCenter', 'getMapExtent', 'getFullExtent', 'measureArea', 'measureLength', 'clearMap', 'zoomIn', 'zoomOut', 'zoomToExtent', 'zoomToCenter', 'fullExtent', 'getUsageKeyField', 'getPartKeyField', 'buffer', 'setControlOption', 'getAddressList', 'getAddressByXY', 'convertCoords', 'getCenterPoints', 'registerGlobleEvent', 'removeGlobleEvent', 'getExtentByGeoms', 'addMaskLayer', 'getLayerGroupConfig', 'initVectorTile', 'mapDraw', 'setMapDrag', 'setLayerProperty'];
+    var methodEx = ['animateMap','locateFeatureByCoords', 'clearGraphic', 'setGraphicStyle', 'removeMapLayer', 'drawGeometry', 'showRoute', 'clearSelectFeature', 'showWFSLayer', 'showWMSLayer', 'showGridVectorLayer', 'switchBaseLayer', 'clearControl', 'pointSelect', 'queryFeature', 'addPopup', 'setOverlaysVisible', 'removePopup', 'getMapCenter', 'getMapExtent', 'getFullExtent', 'measureArea', 'measureLength', 'clearMap', 'zoomIn', 'zoomOut', 'zoomToExtent', 'zoomToCenter', 'fullExtent', 'getUsageKeyField', 'getPartKeyField', 'buffer', 'setControlOption', 'getAddressList', 'getAddressByXY', 'convertCoords', 'getCenterPoints', 'registerGlobleEvent', 'removeGlobleEvent', 'getExtentByGeoms', 'addMaskLayer', 'getLayerGroupConfig', 'initVectorTile', 'mapDraw', 'setMapDrag', 'setLayerProperty','rotateRrecovery','rotationChangeBack'];
     //业务接口
     var methodBusEx = ['markMap','getCellFieldByXY','getPhyFieldByXY','showMultiObjectCurrentPosition','highLightMultiObjectCurrentPosition','showMultiObjectCurrentPositionCluster','highLightMultiObjectCurrentPositionCluster', 'addHeatMap', 'showGeoLocation', 'showTraceHisLayer', 'clearTraceHisLayer', 'showTraceMultiHisLayer','setTraceMultiState', 'getTraceMultiState', 'traceMultiSelectbyID', 'multiPointsSelectbyID', 'setTraceMultiOptions', 'updateTraceMultiPosition', 'showTraceHisData', 'setTraceState', 'getTraceState', 'setTraceOptions', 'updateTracePosition', 'showTraceSingleLayer', 'traceSingleAppendData', 'hideTraceSingle','setMultiPatrolDynamicPositionOption','showMultiPatrolDynamicPosition','startRealtimeTrace','stopRealtimeTrace','realtimeRrace','stopRealtime','removeRealtimeLayer','getTraceDataInteval', 'queryObjectInfo', 'queryPhylayerFields', 'addControl', 'addMapvLayer', 'removeMapvLayer']
     methodEx = methodEx.concat(methodBusEx);

package/package.json

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