egovamap 0.11.0 → 0.11.4

package/egovamap/egovagis.js

@@ -699,8 +699,8 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
     /**
 	*等值面生成
 	**/
-	that.isobands = function(attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor){
-		scene.fire(msgPrefix + ":isobands", { args: [attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor] },
+	that.isobands = function(attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor,callback){
+		scene.fire(msgPrefix + ":isobands", { args: [attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor,callback] },
 			parentScene);
 	}
 

package/egovamap/egovaglobe.js

@@ -1770,10 +1770,10 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
             return;
         scene.fire((msgPrefix + ":modifyAttributes"), {args: [layerName, objID, newProperties, options, autoRevert]}, parentScene, false);
     };
-	that.focusOnDistrict = function(modelName,positions,config,hideLayerNames){
+	that.focusOnDistrict = function(config, positions, modelName, hideLayerNames){
         if (scene == null)
             return;
-        scene.fire((msgPrefix + ":focusOnDistrict"), {args: [modelName,positions,config,hideLayerNames]}, parentScene, false);
+        scene.fire((msgPrefix + ":focusOnDistrict"), {args: [config, positions, modelName, hideLayerNames]}, parentScene, false);
     };
 	that.showLaserWall = function(coordinatesData, layerName, options){
         if (scene == null)

package/egovamap/egovamap.js

@@ -1310,7 +1310,8 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
                                         tempValue = getRgbaArray(keyValueArray.length ,tempValue);
                                     } else {
                                         // By hth 2021/5/11: 如果颜色大于50，考虑到性能和可能卡死的问题，则直接采用随机颜色赋值且不考虑随机到重复色的情况
-                                        tempValue = getRandomColorArray(keyValueArray.length - tempValue.length, tempValue[0]);
+										var extraColor = getRandomColorArray(keyValueArray.length - tempValue.length, tempValue[0]);
+                                        tempValue = tempValue.concat(extraColor);
                                     }
                                 }
                                 var colorLength = tempValue.length;
@@ -1331,7 +1332,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 								obj[key] = arrayObj[key][colorKey];
 
 								if (index > colorLength - 1) {
-									obj[key] = obj[key] || tempValue[colorLength - 1];
+									obj[key] = obj[key] || tempValue[Math.round(Math.random() * (colorLength - 1))];
 								} else {
 									obj[key] = obj[key] || tempValue[index];
 								}
@@ -3327,10 +3328,10 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		 * @param {Number} hascelllabel 是否获取插值数值
 		 * @param {Number} labelcolor 插值颜色
 		 */
-	that.isobands = function(attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor){
+	that.isobands = function(attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor,callback){
 		if (scene == null) { return; }
 		if (gisMap != null) {
-			gisMap.isobands(attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor);
+			gisMap.isobands(attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor,callback);
 		}
 	}
 	
@@ -3475,11 +3476,11 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		* @author: Hetianhong
 		* @date: 2021-07-09 14:51:52
 	*/
-	that.focusOnDistrict = function (modelName,positions,config,hideLayerNames) {
+	that.focusOnDistrict = function (config, positions, modelName, hideLayerNames) {
 		if (scene == null)
 			return;
 		if (globeMap != null) {
-			globeMap.focusOnDistrict(modelName,positions,config,hideLayerNames);
+			globeMap.focusOnDistrict(config, positions, modelName, hideLayerNames);
 		}
 	}
 

package/package.json

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