egovamap 0.18.2 → 0.18.5

package/egovamap/egovaBI.js

@@ -125,6 +125,18 @@ var egovaBI = function(globeMap, gisMap, mapType){
             p.symbolUrl = options.textStyle.symbolUrl || "location.png";
             p.scale = options.textStyle.scale;
             p.angle = options.textStyle.angle;
+            //classify symbol
+            if (options.textStyle.enableClassify) {
+                const customScheme = options.textStyle.customScheme;
+                const classField = options.textStyle.classField;
+                if (p[classField] && Object.prototype.toString.call(customScheme)=="[object Array]" && customScheme.length) {
+                    customScheme.forEach(scheme => {
+                        if (scheme.type == p[classField]) {
+                            scheme.imageUrl && (p.symbolUrl = scheme.imageUrl);
+                        }
+                    });
+                }
+            }
             //textValue
             if (options.textStyle.enableText) {
                 p.labelStyle = {
@@ -136,7 +148,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     font: {
                         size: options.textStyle.fontSize + "px",
                         weight: options.textStyle.fontWeight,
-                        family: options.textStyle.family || "microsoft-yahei"
+                        family: options.textStyle.family || "microsoft-yahei-regular"
                     }
                 };
             }
@@ -178,7 +190,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                             font: {
                                 size: options.clusterStyle.fontSize + "px",
                                 weight: options.clusterStyle.fontWeight || "normal",
-                                family: options.clusterStyle.family || "microsoft-yahei"
+                                family: options.clusterStyle.family || "microsoft-yahei-regular"
                             }
                         }
                     };
@@ -302,76 +314,82 @@ var egovaBI = function(globeMap, gisMap, mapType){
     * @author: Hetianhong
     * @date: 2021-09-09 14:49:49
     */
-   this.drawPoints = function (layerName, positions, options) {
-        if(globeMap && mapType == "globe"){
-            if (!options.layerUsage || !options.layerUsage.usageID) {
+    this.drawPoints = function (layerName, positions, options) {
+        let drawData = function (layerName, positions, options) {
+            if (globeMap && mapType == "globe") {
                 globeMap.drawPoints(layerName, positions, options);
-                return;
-            }
-            let queryFeature = (queryParams) => {
-                    return new Promise(function(resolve) {
-                        let cb = function(result) {
-                            resolve(result)
-                        }
-                        if(gisMap) {
-                            gisMap.queryFeature(queryParams, cb);
-                        }else{
-                            return Promise.resolve(undefined)
-                        }
-                    })
-              
-            }
-            let queryParams = {
-                layerID: options.layerUsage.usageID,
-                outGeometry: true,
+            }else if(gisMap && mapType == "map"){
+                deal2DPoints(layerName, positions, options).then(args => {
+                    gisMap.showMultiObjectCurrentPosition(
+                        args.datalist,
+                        args.zoom,
+                        args.clear,
+                        args.highLightType,
+                        args.infoStyle,
+                        args.renderCanvas,
+                        args.tagName,
+                        options.clickCallback,
+                        options.mouseOverCallback,
+                        args.clusterOption,
+                        args.hasHover,
+                        layerName,
+                        options.mouseOutCallback,
+                        options.option
+                    );
+                });
             }
-            queryFeature(queryParams)
-            .then(function(resultData) {
-                if(!resultData) {
-                    console.log('没有查询到数据，请检查查询参数')
-                    return
-                }
-                let dataCache=[];
-                let errorSize=0;
-                resultData.forEach(element => {
-                    let x,y;
-                    if(element.geometry){
-                         x=element.geometry.x;
-                         y=element.geometry.y;
+        }
+
+
+        if (!options.usageID) {
+            drawData(layerName, positions, options);
+            return;
+        }
+        let queryFeature = (queryParams) => {
+                return new Promise(function(resolve) {
+                    let cb = function(result) {
+                        resolve(result)
                     }
-                    if(x&&y){
-                        let item={...element.attributes,x,y};
-                        dataCache.push(item);
+                    if(gisMap) {
+                        gisMap.queryFeature(queryParams, cb);
                     }else{
-                        errorSize++;
+                        return Promise.resolve(undefined)
                     }
-                });
-                if(errorSize>0){
-                    console.error(`${errorSize}个点格式错误，无法正常加载`);
-                }
-                globeMap.drawPoints(layerName, dataCache, options);
-            })
+                })
+          
         }
-        if(gisMap && mapType == "map"){
-            deal2DPoints(layerName, positions, options).then(args => {
-                gisMap.showMultiObjectCurrentPosition(
-                    args.datalist,
-                    args.zoom,
-                    args.clear,
-                    args.highLightType,
-                    args.infoStyle,
-                    args.renderCanvas,
-                    args.tagName,
-                    options.clickCallback,
-                    options.mouseOverCallback,
-                    args.clusterOption,
-                    args.hasHover,
-                    layerName,
-                    options.mouseOutCallback,
-                    options.option
-                );
-            });
+        let queryParams = {
+            layerID: options.usageID,
+            outGeometry: true,
         }
+        queryFeature(queryParams)
+        .then(function(resultData) {
+            if(!resultData) {
+                console.log('没有查询到数据，请检查查询参数')
+                return
+            }
+            let dataCache=[];
+            let errorSize=0;
+            resultData.forEach(element => {
+                let x,y;
+                if(element.geometry){
+                     x=element.geometry.x;
+                     y=element.geometry.y;
+                }
+                if(x&&y){
+                    let item={...element.attributes,x,y};
+                    dataCache.push(item);
+                }else{
+                    errorSize++;
+                }
+            });
+            if(errorSize>0){
+                console.error(`${errorSize}个点格式错误，无法正常加载`);
+            }
+            
+            drawData(layerName, dataCache, options);
+        })
+       
     }
     this.getLabel = function (attributes) {
         if (!attributes) return;
@@ -675,6 +693,9 @@ var egovaBI = function(globeMap, gisMap, mapType){
             }
         }
     }
+    this.cancelHighlightedRegion=function(layerName){
+        globeMap.cancelHighlightedRegion(layerName);
+    }
     /*
      * @description:新参数格式的旧线接口，主要用来做中间层参数格式转换
      * @method showPolyline_BI
@@ -848,7 +869,8 @@ var egovaBI = function(globeMap, gisMap, mapType){
                    if(!specialArea.geometries){
                      specialArea.geometries=[];
                    }
-                   let filterResult=new Function(`return ${specialArea.statusControl.compiled}`)().call(null,feature.attributes);
+                   var attributes=JSON.parse(JSON.stringify(feature.attributes));
+                   let filterResult=new Function(`return ${specialArea.statusControl.compiled}`)().call(null,attributes);
                    if(filterResult==true){
                      specialArea.geometries.push(geom);
                      hasPush=true;

package/egovamap/egovagis.js

@@ -604,10 +604,10 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		scene.fire((msgPrefix + ":getBuffer"), {args: args}, parentScene, true);
 	}
 	/* 获取多点的缓冲区 */
-	that.getMultiPointBuffer = function(points, radius){
+	that.getMultiPointBuffer = function(points, radius, callback, options){
 		if (scene == null)
 			return;
-		scene.fire((msgPrefix + ":getMultiPointBuffer"), {args: [points, radius]}, parentScene, true);
+		scene.fire((msgPrefix + ":getMultiPointBuffer"), {args: [points, radius, callback, options]}, parentScene, true);
 
 	}
 	/**

package/egovamap/egovaglobe.js

@@ -1837,6 +1837,11 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
         if (scene == null)
             return;
         scene.fire((msgPrefix + ":regionOperation"), {args: [options, data]}, parentScene, false);
+    };
+	that.cancelHighlightedRegion = function(layerName){
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":cancelHighlightedPrimitive"), {args: [layerName]}, parentScene, false);
     };
 	that.activeLayer = function(layerName, options, filter){
         if (scene == null)

package/egovamap/egovamap.js

@@ -1843,7 +1843,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	 * @param {*} radius 缓冲距离，单位为米
 	 * @returns 
 	 */
-	 that.getMultiPointBuffer = function(points, radius){
+	 that.getMultiPointBuffer = function(points, radius, callback, options){
 		if (scene == null)
 			return;
 		if (gisMap != null)

package/package.json

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