egovamap 0.15.2 → 0.15.6

package/egovamap/egovaBI.js

@@ -348,6 +348,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                 var subUniqueCode = options.subUniqueCode;
                 let queryCallback = function (featureInfos) {
                     var features = featureInfos[queryParam.phyLayerIDs];
+                    if (!features || !features.length) return;
                     var symbolUrl = "";
                     if (subUniqueCode.indexOf("http") > -1) {
                         symbolUrl = subUniqueCode;
@@ -377,7 +378,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
     this.drawOtherParts = function (options, data) {
         var self = this;
         const geomType = options.geomType;
-        let queryParam = options.queryParam;
+        let queryParam = options.queryParam || {};
         function showParts(data) {
 
         }
@@ -386,29 +387,34 @@ var egovaBI = function(globeMap, gisMap, mapType){
             showParts(data);
         } else {
             const layerID = queryParam.phyLayerIDs;
+            const layerName = queryParam.layerName;
             const keyField = null;
             const keyValue = null;
             const clearMap = queryParam.clearMap || true;
             let inStyle = queryParam.style || {
-                color: "lightblue"
+                color: "blue"
             };
             let inHStyle = queryParam.hStyle || {
-                color: "lightblue"
+                color: "blue"
             };
             let style = null, hStyle = null;
             if (geomType == 1) {
             } else if (geomType == 2) {
                 style = {
                     type: "simple-line",  // autocasts as new SimpleLineSymbol()
-                    color: inStyle.color || "lightblue",
+                    color: inStyle.color || "blue",
                     width: inStyle.width || "2px",
-                    style: inStyle.style || "solid"
+                    style: inStyle.style || "solid",
+                    cap: inStyle.cap || "round",
+                    join: inStyle.join || "round",
                 };
                 hStyle = {
                     type: "simple-line",  // autocasts as new SimpleLineSymbol()
-                    color: inHStyle.color || "lightblue",
-                    width: inHStyle.width || "2px",
-                    style: inHStyle.style || "solid"
+                    color: inHStyle.color || "red",
+                    width: inHStyle.width || inStyle.width || "2px",
+                    style: inHStyle.style || inStyle.style || "solid",
+                    cap: inHStyle.cap || inStyle.cap || "round",
+                    join: inHStyle.join || inStyle.join || "round",
                 };
             } else if (geomType == 3) {
                 style = {
@@ -416,17 +422,23 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     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"
+                        color: inStyle.outlineColor || "blue",
+                        width: inStyle.outlineWidth || "1px",
+                        style: inStyle.outlineStyle || "solid",
+                        cap: inStyle.outlineCap || "round",
+                        join: inStyle.outlineJoin || "round",
                     }
                 };
                 hStyle = {
                     type: "simple-fill",  // autocasts as new SimpleFillSymbol()
                     color: inHStyle.color || [51, 51, 204, 0.9],
-                    style: inHStyle.style || "solid",
+                    style: inHStyle.style || inStyle.style || "solid",
                     outline: {  // autocasts as new SimpleLineSymbol()
-                        color: inHStyle.outlineColor || "white",
-                        width: inHStyle.outlineWidth || "1px"
+                        color: inHStyle.outlineColor || "red",
+                        width: inHStyle.outlineWidth || inStyle.outlineWidth || "1px",
+                        style: inHStyle.outlineStyle || inStyle.outlineStyle || "solid",
+                        cap: inHStyle.outlineCap || inStyle.outlineCap || "round",
+                        join: inHStyle.outlineJoin || inStyle.outlineJoin || "round",
                     }
                 };
             }
@@ -436,8 +448,13 @@ var egovaBI = function(globeMap, gisMap, mapType){
             const labelstyle = null;
             const geometry = null;
             const where = queryParam.where || "1=1";
+            const opts = {
+                layerId: layerName,
+                mouseOverCallback: queryParam.mouseOverCallback
+            };
 
-            let param = [layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelField, labelstyle, geometry, where];
+            let param = [layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelField, labelstyle, geometry, where, null, null, opts, null, null, null, null, null, null, queryParam.callback];
+            //let param = [layerID, keyField, keyValue, clearMap, style, hStyle, bZoom, randomColor, labelField, labelstyle, geometry, where, null, null, opts, null, null, null, null, queryParam.callback];
             if (globeMap) {
                 gisMap.locateFeatureByIDs(...param);
             } else if (gisMap) {
@@ -483,10 +500,10 @@ var egovaBI = function(globeMap, gisMap, mapType){
             }
         }
 
-        if(data) {
+        if (data) {
             execOperation(data);
         } else {
-            if(!options.idbSetting.usageID){return}
+            if (!options.idbSetting.usageID) { return }
 
             let storeName = !!globeMap ? "usageID" : "usage2D" + "_" + options.idbSetting.usageID;
             let queryFromGIS = () => {
@@ -496,33 +513,33 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     where: filterString,
                     geometry: '',
                     outGeometry: true,
-                    options:{
-                        originalData:true
+                    options: {
+                        originalData: true
                     }
                 }
                 let queryCallback = function (featureInfos) {
                     execOperation(featureInfos);
                 }
-                if(gisMap) {
-                    gisMap.queryFeature(queryParam, queryCallback) 
+                if (gisMap) {
+                    gisMap.queryFeature(queryParam, queryCallback)
                 }
             }
 
-            if(!options.idbSetting.enabled) {
+            if (!options.idbSetting.enabled) {
                 // 直接查询
                 queryFromGIS()
             } else {
                 // 查询是否存在表
                 checkObjectStore(storeName)
-                .then(function(hasObjStore) {
-                    if(hasObjStore) {
-                        // 如果有，读取本地
-                        execOperation(); 
-                    } else {
-                        // 如果没有，查询queryFeature
-                        queryFromGIS()
-                    }
-                })
+                    .then(function (hasObjStore) {
+                        if (hasObjStore) {
+                            // 如果有，读取本地
+                            execOperation();
+                        } else {
+                            // 如果没有，查询queryFeature
+                            queryFromGIS()
+                        }
+                    })
             }
         }
     }

package/egovamap/egovagis.js

@@ -581,6 +581,13 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 				}
 				scene.fire((msgPrefix + ":getBuffer"), {args: args}, parentScene, true);
 			}
+	/* 获取多点的缓冲区 */
+	that.getMultiPointBuffer = function(points, radius){
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":getMultiPointBuffer"), {args: args}, parentScene, true);
+
+	}
 	/* 显示监督员责任网格 */
 	that.showPatrolDutygridCells = function(infoJson, zoom, clickCallback) {
 		if (scene == null)

package/egovamap/egovagisviewer.js

@@ -751,6 +751,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         var cb = function (type, data) {
             if (callback) {
                 if (type == 'locateFeatureByIDsCallback') callback(data);
+                else if (type == 'locateFeatureByIDsMouseOver') options && options.mouseOverCallback(data);
             } else {
                 that.fireCallback(type, data);
             }

package/egovamap/egovamap.js

@@ -1793,7 +1793,17 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		}
 
 	}
-
+	/**
+	 * @param {*} points 点位坐标list，[[x,y],...]
+	 * @param {*} radius 缓冲距离，单位为米
+	 * @returns 
+	 */
+	 that.getMultiPointBuffer = function(points, radius){
+		if (scene == null)
+			return;
+		if (gisMap != null)
+			gismap.getMultiPointBuffer(this, arguments);
+	}
 
 	/* 显示监督员责任网格 */
 	that.showPatrolDutygridCells = function (infoJson, zoom, clickCallback) {

package/package.json

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