egovamap 0.15.7 → 0.15.10

package/egovamap/egovaBI.js

@@ -306,6 +306,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
             var drawParam = options.drawParam || {};
             var ctrOption = drawParam.clusterOption;
             var clusterOption = {
+                clusterType: ctrOption.clusterType,
                 level: ctrOption.level || 0,
                 style: {
                     "type": "simple-marker",
@@ -322,7 +323,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     "color": ctrOption.labelColor || [255, 255, 255, 1],
                     "text": "",
                     "zlevel": ctrOption.labelZlevel || 1,
-                    "yoffset": -4,
+                    "yoffset": 0,
                     "font": ctrOption.labelFont || {
                         "family": "Arial",
                         "size": 10
@@ -772,7 +773,14 @@ var egovaBI = function(globeMap, gisMap, mapType){
             }
         } else {
             var _data = JSON.parse(JSON.stringify(data[0]));
-            showGrid(data[0]);
+            var newData = data[0];
+            if (newData && newData.geometry) {
+                _data = JSON.parse(JSON.stringify(data));
+                showGrid(data);
+            } else {
+                showGrid(data[0]);
+            }
+
             var dbRequest = window.indexedDB.open('regionDB');
             dbRequest.onsuccess = function() {
                 addStore(this.result.version);

package/egovamap/egovaglobe.js

@@ -1834,6 +1834,21 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
             return;
         scene.fire((msgPrefix + ":lineOperation"), {args: [options, data]}, parentScene, false);
     };
+	that.getMainSubTypeTree = function(params, callback){
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":getMainSubTypeTree"), {args: [params, callback]}, parentScene, false);
+    };
+	that.getRegion = function(params, callback){
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":getRegion"), {args: [params, callback]}, parentScene, false);
+    };
+	that.getMapConfig = function(key, callback){
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":getMapConfig"), {args: [params, callback]}, parentScene, false);
+    };
 
 	that.init();
 };

package/egovamap/egovamap.js

@@ -3642,6 +3642,9 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	that.getMainSubTypeTree = function (params, callback) {
 		if (scene == null)
 			return;
+		if(globeMap != null) {
+			return globeMap.getMainSubTypeTree(params, callback);
+		}
 		if (gisMap != null) {
 			gisMap.getMainSubTypeTree(params, callback);
 		}
@@ -3659,6 +3662,9 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	that.getRegion = function (params, callback) {
 		if (scene == null)
 			return;
+		if(globeMap != null) {
+			return globeMap.getRegion(params, callback);
+		}
 		if (gisMap != null) {
 			gisMap.getRegion(params, callback);
 		}
@@ -3726,6 +3732,9 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	that.getMapConfig = function(key, callback){
 		if (scene == null)
 			return;
+		if(globeMap != null) {
+			return globeMap.getMapConfig(key, callback)
+		}
 		if (gisMap != null) {
 			gisMap.getMapConfig.apply(this, arguments);
 		}

package/package.json

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