egovamap 0.13.2 → 0.14.2

package/egovamap/egovaBI.js

@@ -290,6 +290,65 @@ var egovaBI = function(globeMap, gisMap, mapType){
             });
         }
    }
+   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);
+            if (globeMap) {
+                globeMap.showMultiObjectCurrentPosition(...drawParam);
+            } else if (gisMap) {
+                gisMap.showMultiObjectCurrentPosition(...drawParam);
+            }
+        }
+
+        if(data) {
+            showParts(data);
+        } else {
+            let queryFromGIS = () => {
+				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,
+								});
+							}));
+                    showParts(dataList);
+                };
+                if(gisMap) {
+                    gisMap.queryPhylayerFeatures(queryParam, queryCallback); 
+                }
+            }
+			queryFromGIS();
+        }
+    }
+	
+	
+	
    /*
     * @description:新的轨迹线接口
     * @method traceOperation
@@ -621,6 +680,65 @@ var egovaBI = function(globeMap, gisMap, mapType){
             }
         }
     }
+
+    this.networkCloud = function (options, positions) {
+        if(!globeMap) {return}
+        globeMap.networkCloud(options, positions)
+    }
+    this.clearNetworkCloud = function (layerNames) {
+        if(!globeMap) {return}
+        globeMap.clearNetworkCloud(layerNames)
+    }
+    this.lineOperation = function(options, data) {
+        if(!options || !options.layerName){
+            console.log('图层名必须传递')
+            return
+        }
+        // 数据获取
+        let queryFeature = (queryParams) => {
+            if(gisMap) {
+                return new Promise(function(resolve) {
+                    let cb = function(result) {
+                        resolve(result)
+                    }
+                    gisMap.queryFeature(queryParams, cb)
+                })
+            } else {
+                return Promise.resolve(undefined)
+            }
+        }
+        // 执行绘制
+        let drawLine = (options, data) => {
+            if(!globeMap) {return}
+            globeMap.lineOperation(options, data)
+        }
+
+        // 主逻辑
+        if(!!data) {
+            drawLine(options, data)
+        } else {
+            if(!options.usageID) {
+                console.log('图层用途必须传递')
+                return
+            }
+            let queryParams = {
+                layerID: options.usageID,
+                where: options.filterString || "1=1",
+                geometry: '',
+                outGeometry: true,
+                options: { originalData: true }
+            }
+            queryFeature(queryParams)
+            .then(function(resultData) {
+                if(!resultData) {
+                    console.log('没有查询到数据，请检查查询参数')
+                    return
+                }
+                drawLine(options, resultData)
+            })
+        }
+
+    }
 }
 
 

package/egovamap/egovagis.js

@@ -510,7 +510,7 @@ 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;
 		// 移除监听
@@ -698,6 +698,14 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 			parentScene);
 	}
     
+    /**
+	*停止绘制要素
+	**/
+	that.stopDraw = function(){
+		scene.fire(msgPrefix + ":stopDraw", { args: [] },
+			parentScene);
+	}
+    
     /**
 	*等值面生成
 	**/

package/egovamap/egovagisviewer.js

@@ -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;
 
@@ -1799,7 +1799,28 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
        
         that.callMap('removeWMSLayer', layerName);
     }
+	
+	that.getMainSubTypeTree = function (params, callback) {
+		if (scene == null)
+			return;
+		var cb = function (type, data) {
+			if (callback && type == 'getMainSubTypeTreeCallback') {
+				callback(data);
+			}
+		};
+		that.callMap('getMainSubTypeTree', params, cb);
+	}
 
+	that.getRegion = function (params, callback) {
+		if (scene == null)
+			return;
+		var cb = function (type, data) {
+			if (callback && type == 'getRegionCallback') {
+				callback(data);
+			}
+		};
+		that.callMap('getRegion', params, cb);
+	}
     that.init();
 }
 

package/egovamap/egovaglobe.js

@@ -1819,6 +1819,21 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
             return;
         scene.fire((msgPrefix + ":activeLayer"), {args: [layerName, options, filter]}, parentScene, false);
     };
+	that.networkCloud = function(options, positions){
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":networkCloud"), {args: [options, positions]}, parentScene, false);
+    };
+	that.clearNetworkCloud = function(layerNames){
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":clearNetworkCloud"), {args: [layerNames]}, parentScene, false);
+    };
+	that.lineOperation = function(options, data){
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":lineOperation"), {args: [options, data]}, parentScene, false);
+    };
 
 	that.init();
 };

package/egovamap/egovamap.js

@@ -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) {
@@ -3596,6 +3596,43 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 			gisMap.removeWMSLayer(layerName);
 		}
 	}
+	
+	/**
+	 * 获取大小类树
+	 * @param {String} params:{
+	 *			usageid: 3002, //区域图层用途
+	 *			regioncode: 420115001, //区域编码
+	 *			where: 'MAIN_UNIQUE_CODE > 0',
+	 *			orderfield: 'SUB_UNIQUE_CODE',
+	 *			returntree: true
+	 *		};
+	 * @callback 回调函数
+	 * @returns {void}
+	 */
+	that.getMainSubTypeTree = function (params, callback) {
+		if (scene == null)
+			return;
+		if (gisMap != null) {
+			gisMap.getMainSubTypeTree(params, callback);
+		}
+	}
+
+	/**
+	 * 获取区域信息
+	 * @param {String} params: {
+	 *			regionType: 1, // 区域类型：1:市 | 2:区 | 3:街道 | 4:社区
+	 *			seniorId: -1
+	 *		}
+	 * @callback 回调函数
+	 * @returns {void}
+	 */
+	that.getRegion = function (params, callback) {
+		if (scene == null)
+			return;
+		if (gisMap != null) {
+			gisMap.getRegion(params, callback);
+		}
+	}
 
 	/**
 	 * 二维展示案件荧光点位接口
@@ -3653,7 +3690,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		if (gisMap != null) {
 			gisMap.traceMultiSelectbyID.apply(this, arguments);
 		}
-	}	
+	}
 
 
 	that.initMap(containerID, callback, mapType, mapConfig);

package/package.json

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