egovamap 0.19.5 → 0.19.6

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/egovagis.js

@@ -700,10 +700,10 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		scene.fire(msgPrefix + ":eventLocate", { args : [ eventID, defaultMapRange ] }, parentScene, false);
 	}
 	/* 显示特定图层 */
-	that.showMapLayers = function(layerTag, showLevel, mode, styles) {
+	that.showMapLayers = function(layerTag, showLevel, mode, styles,layerDefs) {
 		if (scene == null)
 			return;
-		scene.fire(msgPrefix + ":showMapLayers", { args : [ layerTag, showLevel, mode, styles] }, parentScene, false);
+		scene.fire(msgPrefix + ":showMapLayers", { args : [ layerTag, showLevel, mode, styles,layerDefs] }, parentScene, false);
 	}
 	/* 显示车辆人员轨迹 */
 	that.showObjectTrace = function (objectID, symbolType, dateTime, queryCondition, hideControlPanel, symbolPic, optimizeParams, infoCallback, updatePositionCallback, closeCallback, traceDigCallback) {
@@ -883,7 +883,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		scene.fire(msgPrefix + ":showObjectTrace", { args : [ objectID, symbolType, dataTime, queryCondition ]}, parentScene);
 	}
 	/* 绘制巡更路线 */
-	that.showPatrolRoute = function(routeList, type, bClear, editable) {
+	that.showPatrolRoute = function(routeList, type, bClear, editable, zoom, options) {
 		if (scene == null)
 			return;
 		if (!(routeList instanceof Array))
@@ -906,14 +906,21 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 			}
 			graphics.push(graphic);
 		}
-		var style = { color : [ 255, 0, 0, 150 ], width : 2 };
+		var lineStyle = options.lineStyle || {};
+		var arrowStyle = options.arrowStyle || {};
+		var style = { color : [ 255, 0, 0, 150 ], width : 6 };
 		if (type == "dutyGridRoute") {
 			style.color = [ 0, 0, 255, 150 ]
 		}
 		if (type == "patrolRoute") {
 			style.color = [ 0, 255, 0, 150 ]
 		}
-		scene.fire(msgPrefix + ":showPatrolRoute", { args : [ graphics, bClear, style, editable ] }, parentScene);
+		var lineSymbol = Object.assign(style, lineStyle);
+		var arrowSymbol = Object.assign({size: 6}, arrowStyle);
+		var option = {};
+		option.arrowStyle = arrowSymbol;
+		option.visible = options.visible == null || options.visible == "undefined" ? true:options.visible;
+		scene.fire(msgPrefix + ":showPatrolRoute", { args : [ graphics, bClear, lineSymbol, editable, zoom, option ] }, parentScene);
 	}
 	/* 添加巡更路线 */
 	that.addPatrolRoute = function(addCallback, editCallback) {

package/egovamap/egovagisviewer.js

@@ -968,10 +968,10 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
 
     }
     /* 显示特定图层 */
-    that.showMapLayers = function (layerTag, showLevel, mode, styles) {
+    that.showMapLayers = function (layerTag, showLevel, mode, styles,layerDefs) {
         if (scene == null)
             return;
-        that.callMap('showMapLayers', layerTag, showLevel, mode, styles);
+        that.callMap('showMapLayers', layerTag, showLevel, mode, styles,layerDefs);
     }
     that.showWMSLayer = function (layerUsageID, IDs, keyField, geometry, where, layerName, options) {
         if (scene == null)
@@ -1103,7 +1103,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         that.callMap('showObjectTrace', objectID, symbolType, dataTime, queryCondition, hidePanel, symbolPic, optimizeParams, cb);
     }
     /* 绘制巡更路线 */
-    that.showPatrolRoute = function (routeList, type, bClear, editable, zoom, callback) {
+    that.showPatrolRoute = function (routeList, type, bClear, editable, zoom, callback, options) {
         if (scene == null)
             return;
         if (!(routeList instanceof Array))
@@ -1141,16 +1141,20 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
             graphic.label = route.label;
             graphics.push(graphic);
         }
-        var style = {
-            color: [255, 0, 0, 150],
-            width: 2
-        };
-        if (type == "dutyGridRoute") {
-            style.color = [0, 0, 255, 150]
-        }
-        if (type == "patrolRoute") {
-            style.color = [0, 255, 0, 150]
-        }
+        var lineStyle = options.lineStyle || {};
+		var arrowStyle = options.arrowStyle || {};
+		var style = { color : [ 255, 0, 0, 150 ], width : 2 };
+		if (type == "dutyGridRoute") {
+			style.color = [ 0, 0, 255, 150 ]
+		}
+		if (type == "patrolRoute") {
+			style.color = [ 0, 255, 0, 150 ]
+		}
+		var lineSymbol = Object.assign(style, lineStyle);
+		var arrowSymbol = Object.assign({}, arrowStyle);
+		var option = {};
+		option.arrowStyle = arrowSymbol;
+		option.visible = options.visible || true;
         var cb = function (type, data) {
             if (callback && type == 'drawPatrolRouteEditCallback') {
                 callback(data);
@@ -1158,7 +1162,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
                 that.fireCallback(type, data);
             }
         };
-        that.callMap('showPatrolRoute', graphics, bClear, style, editable, zoom, cb);
+        that.callMap('showPatrolRoute', graphics, bClear, lineSymbol, editable, zoom, cb, option);
     }
     /* 添加巡更路线 */
     that.addPatrolRoute = function (addCallback, editCallback) {

package/egovamap/egovamap.js

@@ -1935,7 +1935,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	}
 
 	/* 显示特定图层 */
-	that.showMapLayers = function (layerTag, showLevel, mode, styles) {
+	that.showMapLayers = function (layerTag, showLevel, mode, styles,layerDefs) {
 		if (scene == null)
 			return;
 		if (gisMap != null) {
@@ -2103,7 +2103,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	}
 
 	/* 绘制巡更路线 */
-	that.showPatrolRoute = function (routeList, type, bClear, editable) {
+	that.showPatrolRoute = function (routeList, type, bClear, editable, zoom, options) {
 		if (scene == null)
 			return;
 		if (gisMap != null) {

package/package.json

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