egovamap 0.12.2 → 0.12.6

package/egovamap/egovaBI.js

@@ -380,9 +380,6 @@ var egovaBI = function(globeMap, gisMap, mapType){
      * @date: 2021-11-11 15:40:31
     */
     this.showPolyline_BI = function (layerName, positions = [], options = {}) {
-        if (scene === null) {
-            return;
-        }
         if (globeMap !== null) {
             // 默认参数
             let defaultOpt = {
@@ -421,7 +418,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     //click相关
                     clickColor: "rgb(255, 255, 0.0)", // 点击后的颜色
                     clickWidth: 30, // 点击后的宽度
-                    clickCallback: function(e) {console.log('click polyline', e)},
+                    clickCallback: undefined, // function(e) {console.log('click polyline', e)},
                     mouseOverCallBack: undefined
                 }
             }

package/egovamap/egovagis.js

@@ -16,6 +16,8 @@ function setCookie(name,value){
 }
 
 function checkGisServerURL(url,callback){
+	if(!url) return;
+	
 	var cookieUrl = getCookie("gisUrl");
 	var gisProxyList = url.split(";");
 	cookieUrl&&gisProxyList.push(cookieUrl);
@@ -1077,12 +1079,14 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 	}
 
 	/**查询表信息*/
-	that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage) {
+	that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage, params) {
 		var queryParam = {
 			'tableName': tableName,
 			'xFieldName': xFieldName,
 			'yFieldName': yFieldName
 		};
+		if(params) queryParam = MapUtils.deepClones(true, {}, queryParam, params);
+		
 		that.removeEventBind("queryObjectInfoCallback");
 		that.bindEvent("queryObjectInfoCallback", callback);
 		scene.fire(msgPrefix + ':queryObjectInfo', {args: [JSON.stringify(geoShapes), JSON.stringify(queryParam), usePage, currentPage, numPerPage]}, parentScene, false);

package/egovamap/egovagisviewer.js

@@ -18,6 +18,8 @@ function setCookie(name, value) {
 }
 
 function checkGisServerURL(url, callback) {
+	if(!url) return;
+	
     var cookieUrl = getCookie("gisUrl");
     var gisProxyList = url.split(";");
     cookieUrl && gisProxyList.push(cookieUrl);
@@ -829,7 +831,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     }
 
     /* 初始化实时案件分布 */
-    that.initRecCurrentV2Distribution = function (infoJson, colors, layerName, clickCallback) {
+    that.initRecCurrentV2Distribution = function (infoJson, colors, layerName, clickCallback, sizeScale) {
         if (scene == null || infoJson.length == 0)
             return;
         var cb = function (type, data) {
@@ -837,7 +839,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
                 clickCallback(data);
             }
         };
-        that.callMap('initRecCurrentV2Distribution', infoJson, colors, layerName, cb);
+        that.callMap('initRecCurrentV2Distribution', infoJson, colors, layerName, cb, sizeScale);
     }
     /* 显示实时案件分布 */
     that.showRecCurrentV2Distribution = function (infoJson, zoom, highLight) {
@@ -1559,12 +1561,14 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     }
 
     /**查询表信息*/
-    that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage) {
+    that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage, params) {
         var queryParam = {
             'tableName': tableName,
             'xFieldName': xFieldName,
             'yFieldName': yFieldName
         };
+		if(params) queryParam = MapUtils.deepClones(true, {}, queryParam, params);
+                    
         var cb = function (type, data) {
             if (callback && type == 'queryObjectInfoCallback') {
                 callback(data);

package/egovamap/egovaglobe.js

@@ -16,6 +16,8 @@ function setCookie(name,value){
 }
 
 function checkGlobeServerURL(url,callback){
+	if(!url) return;
+	
 	var cookieUrl = getCookie("globeGisUrl");
 	var gisProxyList = url.split(";");
 	cookieUrl && gisProxyList.push(cookieUrl);
@@ -759,10 +761,10 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
 	}
 
 	/* 缩放到指定中心点和级别 */
-	that.centerAndZoom = function(x, y, level, heading, picth, duration) {
+	that.centerAndZoom = function(x, y, level, heading, picth, duration, opt) {
 		if (scene == null)
 			return;
-		that.fireEvent("centerAndZoom", {args: [x, y, level, heading, picth, duration]}, false);
+		that.fireEvent("centerAndZoom", {args: [x, y, level, heading, picth, duration, opt]}, false);
 	}
 
 	/* 缩放到指定级别 */

package/egovamap/egovamap.js

@@ -395,7 +395,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 
 	}
 	/* 缩放到指定中心点和级别 */
-	that.centerAndZoom = function (x, y, level, heading, picth, duration) {
+	that.centerAndZoom = function (x, y, level, heading, picth, duration, opt) {
 		if (scene == null)
 			return;
 		if (gisMap != null) {
@@ -403,7 +403,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		}
 		if (globeMap != null) {
 			var lonlat = MapUtils.toLonLat(x, y);
-			globeMap.centerAndZoom(lonlat.x, lonlat.y, level, heading, picth, duration);
+			globeMap.centerAndZoom(lonlat.x, lonlat.y, level, heading, picth, duration, opt);
 		}
 	}
 	/* 缩放到指定级别 */
@@ -2281,7 +2281,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		}
 	}
 
-	that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage) {
+	that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage, params) {
 		if (!scene)
 			return;
 		if (gisMap)
@@ -3603,11 +3603,11 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	 * @param {*} colors 颜色数组
 	 * @returns 
 	 */
-	 that.initRecCurrentV2Distribution = function(infoJson, colors, layerName, clickCallback){
+	 that.initRecCurrentV2Distribution = function(infoJson, colors, layerName, clickCallback, sizeScale){
 		if (scene == null)
 			return;
 		if (gisMap != null) {
-			gisMap.initRecCurrentV2Distribution(infoJson, colors, layerName, clickCallback);
+			gisMap.initRecCurrentV2Distribution(infoJson, colors, layerName, clickCallback, sizeScale);
 		}
 	}
 

package/package.json

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