egovamap 0.17.1 → 0.17.4

package/egovamap/egovaBI.js

@@ -22,28 +22,55 @@ var egovaBI = function(globeMap, gisMap, mapType){
         });
     }
 
-    function interpolateColor(start, end, count) {
-        if (count < 2) return [start, end];
-        var r = end[0] - start[0];
-        var g = end[1] - start[1];
-        var b = end[2] - start[2];
-        var opacity = end[3] - start[3];
+    function interpolateColor(startColor, endColor, count) {
+        if (count < 2) return [startColor, endColor];
+
+        var start = rgbToRgbArray(startColor);
+        var end = rgbToRgbArray(endColor);
+        var end0 = end[0];
+        var end1 = end[1];
+        var end2 = end[2];
+        var end3 = end[3];
+        var start0 = start[0];
+        var start1 = start[1];
+        var start2 = start[2];
+        var start3 = start[3];
+
+        var r = end0 - start0;
+        var g = end1 - start1;
+        var b = end2 - start2;
+        var opacity = end3 - start3;
         var step = 1.0 / count;
-        var colors = [start];
+        var colors = [startColor];
         var _count = count - 1;
         for (var i = 1; i < _count; i++) {
             var interval = step * i;
-            colors.push([
-                Math.round(start[0] + interval * r),
-                Math.round(start[1] + interval * g),
-                Math.round(start[2] + interval * b),
-                Math.round(start[3] + interval * opacity),
-            ]) 
+            colors.push('rgba(' +
+                Math.round(start0 + interval * r) + ',' +
+                Math.round(start1 + interval * g) + ',' +
+                Math.round(start2 + interval * b) + ',' +
+                start3 + interval * opacity +
+                ')'); 
         }
-        colors.push(end);
+        colors.push(endColor);
         return colors;
     }
 
+    function rgbToRgbArray(color) {
+        if (!color || (typeof color == 'string'&&color.indexOf('rgb') == -1)) return color;
+	
+        var r, g, b, a;
+        var rgbaAttr = color.match(/[\d.]+/g);
+        if (rgbaAttr.length >= 3) {
+            r = parseInt(rgbaAttr[0]);
+            g = parseInt(rgbaAttr[1]);
+            b = parseInt(rgbaAttr[2]);
+            if (rgbaAttr.length > 3) a = parseFloat(rgbaAttr[3]);
+            else a = 1;
+        }
+        return [ r, g, b, a];
+    };
+
     // 查询idb是否存在表
     function checkObjectStore (storeName) {
         return new Promise((resolve, reject) => {

package/egovamap/egovagis.js

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

package/egovamap/egovagisviewer.js

@@ -670,11 +670,11 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         that.callMap('showLayerTree', openTree);
     }
     /* I查询 */
-    that.identify = function (type, humanID, mapID) {
+    that.identify = function (type, humanID, mapID, options, callback) {
         if (scene == null)
             return;
         //scene.fire(msgPrefix + ":identify", { args: [type, humanID, mapID] }, parentScene);
-        that.callMap('identify', type, humanID, mapID);
+        that.callMap('identify', type, humanID, mapID, options, callback);
     }
     /* 地理编码查询 */
     that.geoCode = function (searchStr, callback) {

package/egovamap/egovamap.js

@@ -886,7 +886,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	}
 
 	/* I查询 */
-	that.identify = function (type, humanID, mapID) {
+	that.identify = function (type, humanID, mapID, options, callback) {
 		if (scene == null)
 			return;
 		if (gisMap != null) {
@@ -3442,11 +3442,13 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		 * @param {Object} boundary 边界要素
 		 * @param {Number} hascelllabel 是否获取插值数值
 		 * @param {Number} labelcolor 插值颜色
+		 * @param {Function} callback 回调函数
+		 * @param {Object} options 设置插值方法,如{model:"IDW",b:2}，表示使用反距离权重插值，b表示距离的幂
 		 */
-	that.isobands = function(attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor,callback){
+	that.isobands = function(attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor,callback,options){
 		if (scene == null) { return; }
 		if (gisMap != null) {
-			gisMap.isobands(attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor,callback);
+			gisMap.isobands(attrarry,xarry,yarry,breaks,breakcolors,cellwidth,boundary,hascelllabel,labelcolor,callback,options);
 		}
 	}
 	

package/package.json

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