egovamap 0.18.3 → 0.18.6

package/egovamap/egovaBI.js

@@ -148,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"
                     }
                 };
             }
@@ -190,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"
                             }
                         }
                     };
@@ -693,6 +693,9 @@ var egovaBI = function(globeMap, gisMap, mapType){
             }
         }
     }
+    this.cancelHighlightedRegion=function(layerName){
+        globeMap.cancelHighlightedRegion(layerName);
+    }
     /*
      * @description:新参数格式的旧线接口，主要用来做中间层参数格式转换
      * @method showPolyline_BI
@@ -902,7 +905,8 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     minZoom: options.visiblitySetting.beginLevel,
                     maxZoom: options.visiblitySetting.endLevel,
                     layerId: options.layerName,
-                    comCallbak: callback
+                    comCallbak: callback,
+                    order: options.order
                     // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
                 },
                 options.layerName, // layerTag
@@ -923,7 +927,8 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     {
                         minZoom: options.visiblitySetting.beginLevel,
                         maxZoom: options.visiblitySetting.endLevel,
-                        layerId: options.layerName
+                        layerId: options.layerName,
+                        order: options.order
                         // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
                     },
                     options.layerName, // layerTag
@@ -949,7 +954,8 @@ var egovaBI = function(globeMap, gisMap, mapType){
                       minZoom: options.visiblitySetting.beginLevel,
                       maxZoom: options.visiblitySetting.endLevel,
                       layerId: options.layerName,
-                      comCallbak: callback
+                      comCallbak: callback,
+                      order: options.order
                       // hLabelStyle: options.hLabelStyle, // 选中文字时效果，没用
                   },
                   options.layerName, // layerTag

package/egovamap/egovagis.js

@@ -462,6 +462,26 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		}
 		scene.fire(msgPrefix + ":getAddressByXY", { args : [ x, y, searchStr, radius ] }, parentScene);
 	}
+	that.getGaAddressByXY = function(x, y, options, callback) {
+		if (scene == null) return;
+		if(callback) {
+			that.removeEventBind("getGaAddressByXYCallback");
+			that.bindEvent("getGaAddressByXYCallback", function (evt) {
+				callback(evt.args);
+			});
+		}
+		scene.fire(msgPrefix + ":getGaAddressByXY", { args : [ x, y, options ] }, parentScene);
+	}
+	that.getGaStandardAddress = function(params, callback) {
+		if (scene == null) return;
+		if(callback) {
+			that.removeEventBind("getGaStandardAddressCallbackCallback");
+			that.bindEvent("getGaStandardAddressCallbackCallback", function (evt) {
+				callback(evt.args);
+			});
+		}
+		scene.fire(msgPrefix + ":getGaStandardAddress", { args : [ params ] }, parentScene);
+	}
 	/* 根据坐标获取单元网格 */
 	that.getCellNameByPosXY = function(x, y, gridType) {
 		if (scene == null)

package/egovamap/egovagisviewer.js

@@ -497,6 +497,13 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         scene.remove(msgPrefix + ":" + msgId, parentScene, stopOnTop);
     }
 
+    /* 切换到平移工具 */
+    that.reorderLayer = function (id, order, options) {
+        if (scene == null)
+            return;
+        that.callMap('reorderLayer', id, order, options);
+    }
+
     /* 切换到平移工具 */
     that.panMap = function () {
         if (scene == null)
@@ -966,10 +973,10 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
             return;
         that.callMap('showMapLayers', layerTag, showLevel, mode, styles);
     }
-    that.showWMSLayer = function (layerUsageID, IDs, keyField, geometry, where, layerName) {
+    that.showWMSLayer = function (layerUsageID, IDs, keyField, geometry, where, layerName, options) {
         if (scene == null)
             return;
-        that.callMap('showWMSLayer', layerUsageID, IDs, keyField, geometry, where, layerName);
+        that.callMap('showWMSLayer', layerUsageID, IDs, keyField, geometry, where, layerName, options);
     }
     that.removeWMSLayerId = function (layerId, options) {
         if (scene == null)

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

@@ -386,6 +386,14 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 
 	}
 
+	that.reorderLayer = function (id, order, options) {
+		if (scene == null)
+			return;
+		if (gisMap != null) {
+			gisMap.reorderLayer(id, order, options);
+		}
+	}
+
 
 	/* 切换到平移工具 */
 	that.panMap = function () {
@@ -573,7 +581,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 
 
 	/*添加WMS服务图层*/
-	that.showWMSLayer = function (layerUsageID, IDs, keyField, geometry, where, layerName) {
+	that.showWMSLayer = function (layerUsageID, IDs, keyField, geometry, where, layerName, options) {
 		if (scene == null)
 			return;
 		if (gisMap != null) {
@@ -964,7 +972,18 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 			gisMap.getAddressByXY.apply(this, arguments);
 		}
 	};
-
+	that.getGaAddressByXY = function (x, y, options, callback) {
+		if (scene == null) return;
+		if (gisMap != null) {
+			gisMap.getGaAddressByXY.apply(this, arguments);
+		}
+	};
+	that.getGaStandardAddress = function (params, callback) {
+		if (scene == null) return;
+		if (gisMap != null) {
+			gisMap.getGaStandardAddress.apply(this, arguments);
+		}
+	};
 	/* 根据坐标获取单元网格 */
 	that.getCellNameByPosXY = function (x, y, gridType) {
 		if (scene == null)

package/package.json

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