egovamap 0.20.0 → 0.21.0

package/egovamap/egovaBI.js

@@ -647,14 +647,14 @@ var egovaBI = function(globeMap, gisMap, mapType){
      * @author: Hetianhong
      * @date: 2021-10-19 17:27:02
     */
-    this.regionOperation = function (options, data, callback) {
+    this.regionOperation = function (options, data, callback,dataLoadCb) {
 
         function execOperation(data) {
             if (globeMap) {
                 globeMap.regionOperation(options, data);
                 callback && callback();
             } else if (gisMap) {
-                gridPolygon2dOperation(options, data, callback);
+                gridPolygon2dOperation(options, data, callback,dataLoadCb);
             }
         }
 
@@ -848,7 +848,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
      * @param {Array} filter.values 过滤值内容数组
      *
      * @return {返回值类型} 返回值说明
-     *
+     *dataLoadCb:加载状态函数
      * @author: Hetianhong
      * @date: 2021-11-26 09:49:16
     */
@@ -861,7 +861,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
         }
     }
 
-    function gridPolygon2dOperation(options, data, callback) {
+    function gridPolygon2dOperation(options, data, callback,dataLoadCb) {
         var storeName = `usage2D_${options.idbSetting.usageID}`;
         function showGrid(realData) {
             // 转换一下
@@ -906,6 +906,18 @@ var egovaBI = function(globeMap, gisMap, mapType){
                 geometries = colorConfig.data;
                 color = colorConfig.color;
             }
+            var lfcOpt = {
+                minZoom: options.visiblitySetting.beginLevel,
+                maxZoom: options.visiblitySetting.endLevel,
+                layerId: options.layerName,
+                comCallbak: callback,
+                order: options.order
+                // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
+            };
+            if (options.labelSetting.labelZoomEnabled == 'show') {
+                lfcOpt.labelMinZoom = options.labelSetting.labelMinZoom;
+                lfcOpt.labelMaxZoom = options.labelSetting.labelMaxZoom;
+            }
             gisMap.locateFeatureByCoords(geometries, 'polygon',
                 options.layerName, // id，如果已经有attributes就没用了
                 options.style, // style
@@ -917,18 +929,23 @@ var egovaBI = function(globeMap, gisMap, mapType){
                 color,
                 false, // renderCanvas
                 true, // singleSelect
-                {
+                lfcOpt,
+                options.layerName, // layerTag
+                options.eventSetting.clickCallback,
+                options.eventSetting.mouseMoveCallback
+            );
+            if (extraGeometries.length) {
+                var lfceOpt = {
                     minZoom: options.visiblitySetting.beginLevel,
                     maxZoom: options.visiblitySetting.endLevel,
                     layerId: options.layerName,
-                    comCallbak: callback,
                     order: options.order
                     // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
-                },
-                options.layerName, // layerTag
-                options.eventSetting.clickCallback
-            );
-            if (extraGeometries.length) {
+                };
+                if (options.labelSetting.labelZoomEnabled == 'show') {
+                    lfceOpt.labelMinZoom = options.labelSetting.labelMinZoom;
+                    lfceOpt.labelMaxZoom = options.labelSetting.labelMaxZoom;
+                }
                 gisMap.locateFeatureByCoords(extraGeometries, 'polygon',
                     options.layerName, // id，如果已经有attributes就没用了
                     options.specialAreaStyle, // style
@@ -940,18 +957,25 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     false, // randomColor
                     false, // renderCanvas
                     true, // singleSelect
-                    {
-                        minZoom: options.visiblitySetting.beginLevel,
-                        maxZoom: options.visiblitySetting.endLevel,
-                        layerId: options.layerName,
-                        order: options.order
-                        // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
-                    },
+                    lfceOpt,
                     options.layerName, // layerTag
-                    options.eventSetting.clickCallback
+                    options.eventSetting.clickCallback,
+                    options.eventSetting.mouseMoveCallback
                 );
             }
-            if(specialAreaS&&specialAreaS.length>0){
+            if (specialAreaS && specialAreaS.length > 0) {
+                var lfcsOpt = {
+                    minZoom: options.visiblitySetting.beginLevel,
+                    maxZoom: options.visiblitySetting.endLevel,
+                    layerId: options.layerName,
+                    comCallbak: callback,
+                    order: options.order
+                    // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
+                };
+                if (options.labelSetting.labelZoomEnabled == 'show') {
+                    lfcsOpt.labelMinZoom = options.labelSetting.labelMinZoom;
+                    lfcsOpt.labelMaxZoom = options.labelSetting.labelMaxZoom;
+                }
                 for (var j = 0; j < specialAreaS.length; j++) {
                   var specialArea=specialAreaS[j];
                   if(specialArea.geometries.length>0){
@@ -966,21 +990,18 @@ var egovaBI = function(globeMap, gisMap, mapType){
                   false,// randomColor
                   false, // renderCanvas
                   true, // singleSelect
-                  {
-                      minZoom: options.visiblitySetting.beginLevel,
-                      maxZoom: options.visiblitySetting.endLevel,
-                      layerId: options.layerName,
-                      comCallbak: callback,
-                      order: options.order
-                      // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
-                  },
+                  lfcsOpt,
                   options.layerName, // layerTag
-                  options.eventSetting.clickCallback
+                  options.eventSetting.clickCallback,
+                  options.eventSetting.mouseMoveCallback
               );
                   }
                   
                 }
               }
+            if(dataLoadCb){
+                dataLoadCb(true)
+            }
         }
 
         if (!data) {
@@ -996,6 +1017,12 @@ var egovaBI = function(globeMap, gisMap, mapType){
                 }
             }
         } else {
+            if(data.length==0){
+                if(dataLoadCb){
+                    dataLoadCb(false)
+                }
+                return;
+            }
             var _data = JSON.parse(JSON.stringify(data[0]));
             var newData = data[0];
             if (newData && newData.geometry) {
@@ -1115,6 +1142,16 @@ var egovaBI = function(globeMap, gisMap, mapType){
         }
 
     }
+    this.enableMapEvents = function (enablePan, enableZoom,callbackArray) {
+        if (gisMap != null && mapType == "map") {
+            gisMap.enableMapEvents(enablePan, enableZoom,callbackArray);
+        }
+    }
+    this.setMapOpacity = function (opacity) {
+        if (gisMap != null && mapType == "map") {
+            gisMap.setMapOpacity(opacity);
+        }
+    }
 }
 
 

package/egovamap/egovagis.js

@@ -310,6 +310,14 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		scene.fire(msgPrefix + ":removeWMSLayer", { args : [ serviceID ] }, parentScene, false);
 	}
 
+    /*添加自定义WMS服务图层*/
+	that.addCustomWMSLayer = function(layerID, style, hStyle,where,outFields,visibleLevel,colorseparField,colorseparoptions) {
+		if (scene == null)
+			return;
+		scene.fire(msgPrefix + ":addCustomWMSLayer", { args : [ layerID, style, hStyle,where,outFields,visibleLevel,colorseparField,colorseparoptions ] }, parentScene, false);
+	}
+
+
 
 	/*根据要素坐标定位显示要素*/
 	that.locateFeatureByCoords=function(geometries, type, ID, style, hStyle, zoom, keyFiled, labelField, labelStyle, randomColor, renderCanvas, singleSelected, options, layerTag){
@@ -700,10 +708,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 +891,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 +914,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

@@ -558,12 +558,16 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         }
     }
     /*根据要素坐标定位显示要素*/
-    that.locateFeatureByCoords = function (geometries, type, ID, style, hStyle, zoom, keyFiled, labelField, labelStyle, randomColor, renderCanvas, singleSelected, options, layerTag, callback) {
+    that.locateFeatureByCoords = function (geometries, type, ID, style, hStyle, zoom, keyFiled, labelField, labelStyle, randomColor, renderCanvas, singleSelected, options, layerTag, callback,mouseMoveCallback) {
         if (scene == null)
             return;
         var cb = function (type, data) {
-            if (callback && type == 'locateFeatureByIDsCallback')
+            if (callback && type == 'locateFeatureByIDsCallback'){
                 callback(data);
+            } 
+            if (mouseMoveCallback && type != 'locateFeatureByIDsCallback'){
+                mouseMoveCallback(type, data);
+            }
         };
         that.callMap('locateFeatureByCoords', geometries, type, ID, style, hStyle, zoom, keyFiled, labelField, labelStyle, randomColor, renderCanvas, singleSelected, options, layerTag, cb);
     }
@@ -968,10 +972,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)
@@ -983,6 +987,11 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
             return;
         that.callMap('removeWMSLayerId', layerId, options);
     }
+    that.addCustomWMSLayer = function (layerID, style, hStyle,where,outFields,visibleLevel,colorseparField,colorseparoptions) {
+        if (scene == null)
+            return;
+        that.callMap('addCustomWMSLayer', layerID, style, hStyle,where,outFields,visibleLevel,colorseparField,colorseparoptions);
+    }
 
     /* 刷新图层目录树中图层 */
     that.refreshMapLayers = function () {
@@ -1103,7 +1112,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 +1150,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 +1171,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) {
@@ -1762,8 +1775,8 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     that.startQueryWMSFeature = function (layerUsageID, IDs, keyField, geometry, where, hideInfoWindow) {
         that.callMap('startQueryWMSFeature', layerUsageID, IDs, keyField, geometry, where, hideInfoWindow);
     }
-    that.enableMapEvents = function (enablePan, enableZoom) {
-        that.callMap('enableMapEvents', enablePan, enableZoom);
+    that.enableMapEvents = function (enablePan, enableZoom,callbackArray) {
+        that.callMap('enableMapEvents', enablePan, enableZoom,callbackArray);
     }
 
     /* 获取坐标和层级 */
@@ -1868,9 +1881,15 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     }
 
     that.addRadar = function(options){
-        that.callMap('addRadar', options.x, options.y, options.radius, options.symbolUrl);
+        that.callMap('addRadar', options.x, options.y, options.radius, options.symbolUrl, options.speed);
+    }
+    /**
+     * 设置基础图层透明度
+     * @param {*} opacity 0.01-1
+     */
+    that.setMapOpacity = function (opacity) {
+        that.callMap('setMapOpacity', opacity);
     }
-
     that.init();
 }
 

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) {
@@ -3460,6 +3460,15 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 			gisMap.addWMSLayer(id, url, options);
 		}
 	}
+	
+	//添加自定义WMS图层
+	that.addCustomWMSLayer = function (layerID, style, hStyle,where,outFields,visibleLevel,colorseparField,colorseparoptions) {
+		if (scene == null)
+			return;
+		if (gisMap != null) {
+			gisMap.addCustomWMSLayer(layerID, style, hStyle,where,outFields,visibleLevel,colorseparField,colorseparoptions);
+		}
+	}
 	/**
 	 * 添加WMTS图层
 	 * @param {String} id 图层id

package/egovamap/mapUtils.js

@@ -1,5 +1,6 @@
 import CoordConvConfig from './coordconvert/CoordConvConfig';
-var coordConvert=require('egovacoordconvert/index');
+import * as coordConvert from 'egovacoordconvert/build/dist/coordconvert';
+
 var MapUtils = {
 	type: function (obj) {
 		var result = Array.isArray(obj) ? 'array' : (typeof obj);

package/package.json

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