egovamap 0.14.1 → 0.14.5

package/egovamap/egovaBI.js

@@ -278,88 +278,185 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     args.highLightType,
                     args.infoStyle,
                     args.renderCanvas,
-                    options.clickCallback,
                     args.tagName,
+                    options.clickCallback,
+                    options.mouseOverCallback,
                     args.clusterOption,
                     args.hasHover,
-                    options.mouseOverCallback,
-                    options.mouseOutCallback,
                     layerName,
+                    options.mouseOutCallback,
                     options.option
                 );
             });
         }
-   }
-   this.getLabel = function(attributes){
-		if(!attributes) return;
-		var label = [], field = {};
-		for(var key in attributes){
-			field = {};
-			field[key] = attributes[key];
-			label.push(field);
-		}
-		return label;
-	}
-   this.drawParts = function (options, data) {
-	   var self = this;
+    }
+    this.getLabel = function (attributes) {
+        if (!attributes) return;
+        var label = [], field = {};
+        for (var key in attributes) {
+            field = {};
+            field[key] = attributes[key];
+            label.push(field);
+        }
+        return label;
+    };
+    this.drawParts = function (options, data) {
+        var self = this;
         function showParts(data) {
-			var drawParam = options.drawParam || [];
-			drawParam.unshift(data);
+            var drawParam = options.drawParam || {};
+            var ctrOption = drawParam.clusterOption;
+            var clusterOption = {
+                level: ctrOption.level || 0,
+                style: {
+                    "type": "simple-marker",
+                    "style": "circle",
+                    "color": ctrOption.color || [255, 0, 0, 0.6],
+                    "size": ctrOption.size || 20,
+                    "outline": { //if outline has been specified
+                        "color": ctrOption.outlineColor || [255, 168, 0, 1],
+                        "width": ctrOption.outlineWidth || 2
+                    }
+                },
+                labelStyle: {
+                    "type": "text",
+                    "color": ctrOption.labelColor || [255, 255, 255, 1],
+                    "text": "",
+                    "zlevel": ctrOption.labelZlevel || 1,
+                    "font": ctrOption.labelFont || {
+                        "family": "Arial",
+                        "size": 10
+                    }
+                },
+                distance: ctrOption.distance || 50
+            };
+
+            var param = [data, true, false, null, null, false, drawParam.tagName, clusterOption, false, drawParam.callback, drawParam.layerName, drawParam.drawOptions];
             if (globeMap) {
-                globeMap.showMultiObjectCurrentPosition(...drawParam);
+                globeMap.showMultiObjectCurrentPosition(...param);
             } else if (gisMap) {
-                gisMap.showMultiObjectCurrentPosition(...drawParam);
+                gisMap.showMultiObjectCurrentPosition(...param);
             }
         }
 
-        if(data) {
+        if (data) {
             showParts(data);
         } else {
             let queryFromGIS = () => {
-				let queryParam = options.queryParam;
-				var subTypeName = options.subTypeName;
+                let queryParam = options.queryParam;
+                var subTypeName = options.subTypeName;
                 var subUniqueCode = options.subUniqueCode;
                 let queryCallback = function (featureInfos) {
-					var features = featureInfos[queryParam.phyLayerIDs];
-					var symbolUrl = "";
-					if(subUniqueCode.indexOf("http") > -1){
-						symbolUrl = subUniqueCode;
-					}else if(subUniqueCode.indexOf(".") > -1){
-						symbolUrl = subUniqueCode;
-					}else{
-						symbolUrl = "".concat(subUniqueCode, ".png");
-					}
-					var dataList = features.map((function (feature) {
-								return Object.assign({}, {x:feature.geometry.x,y:feature.geometry.y}, {
-									attributes: feature.attributes,
-									//label:self.getLabel(feature.attributes),
-									symbolType: -1,
-									symbolUrl: symbolUrl,
-								});
-							}));
+                    var features = featureInfos[queryParam.phyLayerIDs];
+                    var symbolUrl = "";
+                    if (subUniqueCode.indexOf("http") > -1) {
+                        symbolUrl = subUniqueCode;
+                    } else if (subUniqueCode.indexOf(".") > -1) {
+                        symbolUrl = subUniqueCode;
+                    } else {
+                        symbolUrl = "".concat(subUniqueCode, ".png");
+                    }
+                    var dataList = features.map((function (feature) {
+                        return Object.assign({}, { x: feature.geometry.x, y: feature.geometry.y }, {
+                            attributes: feature.attributes,
+                            //label:self.getLabel(feature.attributes),
+                            symbolType: -1,
+                            symbolUrl: symbolUrl,
+                        });
+                    }));
                     showParts(dataList);
                 };
-                if(gisMap) {
-                    gisMap.queryPhylayerFeatures(queryParam, queryCallback); 
+                if (gisMap) {
+                    gisMap.queryPhylayerFeatures(queryParam, queryCallback);
                 }
             }
-			queryFromGIS();
+            queryFromGIS();
         }
-    }
-	
-	
-	
-   /*
-    * @description:新的轨迹线接口
-    * @method traceOperation
-    * @param {Array} posArr 位置数组
-    * @param {Object} options 配置项
-    *
-    * @return {Void} 无返回
-    *
-    * @author: Hetianhong
-    * @date: 2021-09-09 14:49:49
-    */
+    };
+
+    this.drawOtherParts = function (options, data) {
+        var self = this;
+        const geomType = options.geomType;
+        let queryParam = options.queryParam;
+        function showParts(data) {
+
+        }
+
+        if (data) {
+            showParts(data);
+        } else {
+            const layerID = queryParam.phyLayerIDs;
+            const keyField = null;
+            const keyValue = null;
+            const clearMap = queryParam.clearMap || true;
+            let inStyle = queryParam.style || {
+                color: "lightblue"
+            };
+            let inHStyle = queryParam.hStyle || {
+                color: "lightblue"
+            };
+            let style = null, hStyle = null;
+            if (geomType == 1) {
+            } else if (geomType == 2) {
+                style = {
+                    type: "simple-line",  // autocasts as new SimpleLineSymbol()
+                    color: inStyle.color || "lightblue",
+                    width: inStyle.width || "2px",
+                    style: inStyle.style || "solid"
+                };
+                hStyle = {
+                    type: "simple-line",  // autocasts as new SimpleLineSymbol()
+                    color: inHStyle.color || "lightblue",
+                    width: inHStyle.width || "2px",
+                    style: inHStyle.style || "solid"
+                };
+            } else if (geomType == 3) {
+                style = {
+                    type: "simple-fill",  // autocasts as new SimpleFillSymbol()
+                    color: inStyle.color || [51, 51, 204, 0.9],
+                    style: inStyle.style || "solid",
+                    outline: {  // autocasts as new SimpleLineSymbol()
+                        color: inStyle.outlineColor || "white",
+                        width: inStyle.outlineWidth || "1px"
+                    }
+                };
+                hStyle = {
+                    type: "simple-fill",  // autocasts as new SimpleFillSymbol()
+                    color: inHStyle.color || [51, 51, 204, 0.9],
+                    style: inHStyle.style || "solid",
+                    outline: {  // autocasts as new SimpleLineSymbol()
+                        color: inHStyle.outlineColor || "white",
+                        width: inHStyle.outlineWidth || "1px"
+                    }
+                };
+            }
+            const bZoom = queryParam.bZoom || true;
+            const randomColor = null;
+            const labelField = null;
+            const labelstyle = null;
+            const geometry = null;
+            const where = queryParam.where || "1=1";
+
+            let param = [layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelField, labelstyle, geometry, where];
+            if (globeMap) {
+                gisMap.locateFeatureByIDs(...param);
+            } else if (gisMap) {
+                gisMap.locateFeatureByIDs(...param);
+            }
+
+        }
+    };
+
+    /*
+     * @description:新的轨迹线接口
+     * @method traceOperation
+     * @param {Array} posArr 位置数组
+     * @param {Object} options 配置项
+     *
+     * @return {Void} 无返回
+     *
+     * @author: Hetianhong
+     * @date: 2021-09-09 14:49:49
+     */
     this.traceOperation = function (posArr, options) {
         globeMap.traceOperation(posArr, options);
     }

package/egovamap/egovagis.js

@@ -510,12 +510,12 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		}
 	}
 	/* 显示多个自定义图标 */
-	that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clusterOption, hasHover, layerID, clickCallback, mouseOverCallBack) {
+	that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clickCallback, mouseOverCallBack, clusterOption, hasHover, layerID, mouseOutCallback, options) {
 		if (scene == null)
 			return;
 		// 移除监听
-		that.removeEventBind("showMultiObjectCurrentPositionClick");
-		that.removeEventBind("showMultiObjectCurrentPositionMouseover");
+		that.removeEventBind("showMultiObjectCurrentPositionClick"+tagName);
+		that.removeEventBind("showMultiObjectCurrentPositionMouseover"+tagName);
 		var args =[];
 		var FuncList = [];
 		for(var i = 0;i<arguments.length;i++){
@@ -526,12 +526,12 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 			 }
 		}
 		if (FuncList[0] instanceof Function) {
-			that.bindEvent("showMultiObjectCurrentPositionClick", function(evt) {
+			that.bindEvent("showMultiObjectCurrentPositionClick"+tagName, function(evt) {
 				FuncList[0](evt.args);
 			});
 		}
 		if (FuncList[1] instanceof Function) {
-			that.bindEvent("showMultiObjectCurrentPositionMouseover", function(evt) {
+			that.bindEvent("showMultiObjectCurrentPositionMouseover"+tagName, function(evt) {
 				FuncList[1](evt.args);
 			});
 		}
@@ -928,7 +928,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		scene.fire(msgPrefix + ":addChart", {args: [option, zoom,id,minZoom,maxZoom]}, parentScene);
 	}
 
-	that.drawGeometry = function(type, style, clear, callback) {
+	that.drawGeometry = function(type, style, clear, callback, option) {
 		type = type || "point";
 		style = style || {"type":"esriSLS","style":"esriSLSSolid","color":[255,0,0,255],"width":2};
 		//移除监听
@@ -939,7 +939,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 			});
 		}
 
-		scene.fire(msgPrefix + ":drawGeometry", {args: [type, style, clear]}, parentScene);
+		scene.fire(msgPrefix + ":drawGeometry", {args: [type, style, clear, callback, option]}, parentScene);
 	}
 
 	/* 热力图*/

package/egovamap/egovagisviewer.js

@@ -741,7 +741,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         that.callMap('getCellNameByPosXY', x, y, gridType, keyField, queryID, cb);
     }
     /* 根据图层字段定位显示 */
-    that.locateFeatureByIDs = function (layerID, keyFiled, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, outFieldStr, animiteStep, callback, popupTemplate) {
+    that.locateFeatureByIDs = function (layerID, keyFiled, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, outFieldStr, animiteStep, index, clipGeom, callback, popupTemplate) {
         if (scene == null)
             return;
         if (bZoom == undefined)
@@ -755,7 +755,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
                 that.fireCallback(type, data);
             }
         };
-        that.callMap('locateFeatureByIDs', layerID, keyValue, keyFiled, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, outFieldStr, animiteStep, cb, popupTemplate);
+        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) {
@@ -857,7 +857,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     }
 
     /* 显示多个自定义图标 */
-    that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, clickCallback, tagName, clusterOption, hasHover, mouseOverCallback, mouseOutCallback, layerName, options) {
+    that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clickCallback, mouseOverCallback, clusterOption, hasHover, layerName, mouseOutCallback, options) {
         if (scene == null)
             return;
 

package/egovamap/egovamap.js

@@ -930,7 +930,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	};
 
 	/* 根据图层字段定位显示 */
-	that.locateFeatureByIDs = function (layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, successFunc,outFieldStr,animiteStep,index,clipGeom) {
+	that.locateFeatureByIDs = function (layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, successFunc, outFieldStr, animiteStep, index, clipGeom, callback, popupTemplate) {
 		if (scene == null)
 			return;
 
@@ -939,7 +939,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		}
 
 		if (gisMap != null) {
-			gisMap.locateFeatureByIDs.apply(this, [layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag,outFieldStr,animiteStep,index,clipGeom]);
+			gisMap.locateFeatureByIDs.apply(this, [layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelfield, labelstyle, geometry, where, renderCanvas, singleSelected, options, extendProperty, layerTag, outFieldStr, animiteStep, index, clipGeom, callback, popupTemplate]);
 		}
 		if (globeMap != null && gisMap != null) {
 			//三维先调用queryFeature查询要素再用locateFeatureByCoords显示
@@ -1664,7 +1664,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	};
 
 	/* 显示多个自定义图标 */
-	that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clickCallback, mouseOverCallBack, clusterOption, hasHover, layerID) {
+	that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clickCallback, mouseOverCallBack, clusterOption, hasHover, layerID, mouseOutCallback, options) {
 		if (scene == null)
 			return;
 		if (gisMap != null && that.synchroSetting === true) {
@@ -3620,7 +3620,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	/**
 	 * 获取区域信息
 	 * @param {String} params: {
-	 *			regionType: 1,
+	 *			regionType: 1, // 区域类型：1:市 | 2:区 | 3:街道 | 4:社区
 	 *			seniorId: -1
 	 *		}
 	 * @callback 回调函数

package/package.json

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