egovamap 0.14.5 → 0.15.3

package/egovamap/egovaBI.js

@@ -322,6 +322,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     "color": ctrOption.labelColor || [255, 255, 255, 1],
                     "text": "",
                     "zlevel": ctrOption.labelZlevel || 1,
+                    "yoffset": -4,
                     "font": ctrOption.labelFont || {
                         "family": "Arial",
                         "size": 10
@@ -330,7 +331,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                 distance: ctrOption.distance || 50
             };
 
-            var param = [data, true, false, null, null, false, drawParam.tagName, clusterOption, false, drawParam.callback, drawParam.layerName, drawParam.drawOptions];
+            var param = [data, true, false, null, null, false, drawParam.tagName, drawParam.clickCallback, drawParam.mouseOverCallback, clusterOption, false, drawParam.layerName, drawParam.callback, drawParam.drawOptions];
             if (globeMap) {
                 globeMap.showMultiObjectCurrentPosition(...param);
             } else if (gisMap) {
@@ -385,6 +386,7 @@ 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;
@@ -401,13 +403,17 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     type: "simple-line",  // autocasts as new SimpleLineSymbol()
                     color: inStyle.color || "lightblue",
                     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"
+                    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 = {
@@ -415,17 +421,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 || "lightblue",
+                        width: inStyle.outlineWidth || "1px",
+                        style: inStyle.outStyle || "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 || "lightblue",
+                        width: inHStyle.outlineWidth || inStyle.outlineWidth || "1px",
+                        style: inHStyle.outlineStyle || inStyle.outlineStyle || "solid",
+                        cap: inHStyle.outlineCap || inStyle.outlineCap || "round",
+                        join: inHStyle.outlineJoin || inStyle.outlineJoin || "round",
                     }
                 };
             }
@@ -435,8 +447,11 @@ var egovaBI = function(globeMap, gisMap, mapType){
             const labelstyle = null;
             const geometry = null;
             const where = queryParam.where || "1=1";
+            const opts = {
+                layerId: layerName
+            };
 
-            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];
             if (globeMap) {
                 gisMap.locateFeatureByIDs(...param);
             } else if (gisMap) {
@@ -482,10 +497,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 = () => {
@@ -495,33 +510,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

@@ -514,8 +514,14 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		if (scene == null)
 			return;
 		// 移除监听
-		that.removeEventBind("showMultiObjectCurrentPositionClick"+tagName);
-		that.removeEventBind("showMultiObjectCurrentPositionMouseover"+tagName);
+		var clickBackName = "showMultiObjectCurrentPositionClick";
+		var mouseOverBackName = "showMultiObjectCurrentPositionMouseover";
+		if(tagName){
+			clickBackName += tagName;
+			mouseOverBackName += tagName;
+		}
+		that.removeEventBind(clickBackName);
+		that.removeEventBind(mouseOverBackName);
 		var args =[];
 		var FuncList = [];
 		for(var i = 0;i<arguments.length;i++){
@@ -526,12 +532,12 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 			 }
 		}
 		if (FuncList[0] instanceof Function) {
-			that.bindEvent("showMultiObjectCurrentPositionClick"+tagName, function(evt) {
+			that.bindEvent(clickBackName, function(evt) {
 				FuncList[0](evt.args);
 			});
 		}
 		if (FuncList[1] instanceof Function) {
-			that.bindEvent("showMultiObjectCurrentPositionMouseover"+tagName, function(evt) {
+			that.bindEvent(mouseOverBackName, function(evt) {
 				FuncList[1](evt.args);
 			});
 		}
@@ -1132,6 +1138,14 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		return scene.fire(msgPrefix + ":getPolygonArea", {args: [geometry]},parentScene);
 	}
 
+	that.intersectGeometry = function (polygon1, polygon2) {
+		return scene.fire(msgPrefix + ":intersectGeometry", {args: [polygon1, polygon2]}, parentScene);
+	}
+
+	that.getCenterPoint = function (polygon) {
+		return scene.fire(msgPrefix + ":getCenterPoint", {args: [polygon]}, parentScene);
+	}
+
 	/* 根据PointID定位空中全景 */
 	that.mmsAirPanoLocateByID = function(pointID) {
 		if(mmsMap && mmsMap.mmsLoaded) {

package/egovamap/egovagisviewer.js

@@ -1821,6 +1821,11 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
 		};
 		that.callMap('getRegion', params, cb);
 	}
+
+    that.getMapConfig = function(key, callback){
+        that.callMap('getMapConfig', key, callback);
+    }
+
     that.init();
 }
 

package/egovamap/egovamap.js

@@ -2587,6 +2587,26 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 			return gisMap.getPolygonArea.apply(this, arguments);
 	}
 
+	/**
+	 * 计算面的相交部分
+	 */
+	that.intersectGeometry = function(polygon1, polygon2) {
+		if (scene == null)
+			return;
+		if (gisMap != null)
+			return gisMap.intersectGeometry.apply(this, arguments);
+	}
+
+	/**
+	 * 获取面的中心点
+	 */
+	that.getCenterPoint = function(polygon) {
+		if (scene == null)
+			return;
+		if (gisMap != null)
+			return gisMap.getCenterPoint.apply(this, arguments);
+	}
+
 	/* 切换地图类型 */
 	that.changeControlParam = function (type, param) {
 		if (scene == null)
@@ -3692,6 +3712,15 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		}
 	}
 
+	//获取GIS配置
+	that.getMapConfig = function(key, callback){
+		if (scene == null)
+			return;
+		if (gisMap != null) {
+			gisMap.getMapConfig.apply(this, arguments);
+		}
+	}
+
 
 	that.initMap(containerID, callback, mapType, mapConfig);
 

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "egovamap",
-  "version": "0.14.5",
+  "version": "0.15.3",
   "description": "eUrbanGIS SDK",
   "main": "index.js",
   "scripts": {
     "version:minor": "npm version minor -m \"[A]发布 v%s\"",
     "version:patch": "npm version patch -m \"[A]发布修复版本 v%s\"",
     "pub": "npm publish --registry https://registry.npmjs.org/",
-    "postpublish": "git push && git push --tags"
+    "postpublish": "git push && git push --tags",
+    "start": "parcel test/test.html"
   },
   "author": "egova",
   "license": "MIT",
@@ -16,5 +17,8 @@
   },
   "engines": {
     "node": ">=12.13"
+  },
+  "devDependencies": {
+    "parcel": "^2.3.1"
   }
 }