egovamap 0.16.4 → 0.16.7

package/egovamap/egovaBI.js

@@ -333,10 +333,47 @@ var egovaBI = function(globeMap, gisMap, mapType){
             };
 
             var param = [data, true, false, null, null, false, drawParam.tagName, drawParam.clickCallback, drawParam.mouseOverCallback, clusterOption, false, drawParam.layerName, drawParam.callback, drawParam.drawOptions];
+            //三维聚类参数
+            var globeOptions = {
+                zoom:true,
+                scale: 0.9,
+                clear :true,
+                nearFarScalar:[8000, 1.0, 10000, 0.6],
+                clickCallBack: drawParam.clickCallback,
+                layerName: drawParam.layerName,
+                minSize:30,
+                clusterLimit: 20,
+                style:"default",
+                clusterImageInfo: {
+                    horizontalOrigin: "center",
+                    verticalOrigin: "bottom",
+                    cssStyle: {
+                        "borderRadius": 500,
+                        "fillColor": "rgba(0,0,0,0.7)",
+                        "borderLineWidth": 3,
+                        "borderLineColor": "rgba(250,140,0,0.9)",
+                        "paddingX": 15,
+                        "paddingY": 6,
+                        "marginBottom": 2
+                    },
+                    textStyle: {
+                        "font": "60px Helvetica",
+                        "fillColor": "rgba(220,220,220,1.0)",
+                        "outlineColor": "black",
+                        "outlineWidth": 1,
+                        "padding": 1,
+                        "textScale": 0.5,
+                        "textStartX": 40,
+                        "textStartY": 15
+                    }
+                }
+            }
             if (globeMap) {
-                globeMap.showMultiObjectCurrentPosition(...param);
+                globeMap.addClusterLayer({
+                    data,
+                    options:globeOptions
+                })
             } else if (gisMap) {
-                param[5] = true;//三维采用高性能渲染
                 gisMap.showMultiObjectCurrentPosition(...param );
             }
         }
@@ -362,6 +399,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                         symbolUrl = subUniqueCode;
                     } else {
                         symbolUrl = "".concat(subUniqueCode, ".png");
+                        if(globeMap) symbolUrl = queryParam.gisServerURL ? `${queryParam.gisServerURL}/symbol/${symbolUrl}` : symbolUrl;
                     }
                     var dataList = features.map((function (feature) {
                         return Object.assign({}, { x: feature.geometry.x, y: feature.geometry.y }, {
@@ -369,6 +407,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                             label:self.getLabel(feature.attributes),
                             symbolType: -1,
                             symbolUrl: symbolUrl,
+                            scale: 0.5
                         });
                     }));
                     callback && callback(dataList);

package/egovamap/egovagisviewer.js

@@ -523,8 +523,8 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     }
 
     /* 根据regionId缩放 */
-    that.zoomByRegionId = function (regionId, options, callback) {
-        that.callMap('zoomByRegionId', regionId, options, callback);
+    that.zoomByRegionCode = function (regionCode, options, callback) {
+        that.callMap('zoomByRegionCode', regionCode, options, callback);
     }
 
     /* 切换到截图工具 */

package/egovamap/egovaglobe.js

@@ -791,6 +791,14 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
 		that.fireEvent("zoomToLevel", {args: [level, duration]}, false);
 	}
 
+	/* 缩放到指定级别 */
+	that.zoomByRegionCode = function (regionCode, options, callback) {
+		if (scene == null)
+			return;
+
+		that.fireEvent("zoomByRegionCode", {args: [regionCode, options, callback]}, false);
+	}
+
 	//三维场景按照中心点旋转，更方便查看
 	that.rotateScene = function (heading, pitch, roll, duration, callback) {
 		if (scene == null)

package/egovamap/egovamap.js

@@ -426,12 +426,12 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	}
 
 	/* 根据regionId缩放 */
-	 that.zoomByRegionId = function (regionId, options, callback) {
+	 that.zoomByRegionCode = function (regionCode, options, callback) {
         if(gisMap){
-            gisMap.zoomByRegionId(regionId, options, callback);
+            gisMap.zoomByRegionCode(regionCode, options, callback);
         }
         if(globeMap){
-            //globeMap.zoomByRegionId(regionId, options, callback);
+            globeMap.zoomByRegionCode(regionCode, options, callback);
         }
     }
 

package/package.json

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