egovamap 0.15.25 → 0.15.28

package/egovamap/egovagisviewer.js

@@ -93,6 +93,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     }
 
     that.id = msgPrefix ? msgPrefix + "_emap" : 'emap';
+	that.gisDebug = getLocalStorageItem('gisDebug');
     //that.gisMapContainer = $container.getElementsByClassName(id)[0];
     //that.gisMapContainer = $container.find("#" + that.id)[0];
     that.gisMapContainer = document.getElementById(that.id);
@@ -302,7 +303,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         _egovagisviewerUrl = gisServerURL;
         var mainScript = document.createElement('script');
         mainScript.setAttribute('type', 'text/javascript');
-        var distOrSource = getLocalStorageItem('gisDebug') ? 'source' : 'dist';
+        var distOrSource = that.gisDebug ? 'source' : 'dist';
         var cssUrl = gisServerURL + '/library/egovaviewer/build/' + distOrSource + '/index.css';
         var mainLink = document.createElement('link');
         // mainLink.setAttribute('name','egoavagisviewer_' + uniqueID);
@@ -364,7 +365,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     that.globalCallback = function (callbackName, params) {
         if (that.callbackList[callbackName]) {
             var args = [{ args: params }];
-            console.log(callbackName);
+            that.gisDebug && console.log(callbackName);
             that.callbackList[callbackName].apply(that, args);
         } else {
             that.fireCallback(callbackName, params);
@@ -390,7 +391,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
                     args.push(arguments[i]);
                 }
             }
-            console.log(funcName);
+            that.gisDebug && console.log(funcName);
             return eMap[funcName].apply(eMap, args);
         }
     }
@@ -485,7 +486,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
 
     that.fireCallback = function (msgId, msgData, stopOnTop) {
         var args = { args: msgData };
-        console.log(msgId);
+        that.gisDebug && console.log(msgId);
         scene.fire(msgPrefix + ":" + msgId, args, stopOnTop);
     }
 

package/egovamap/egovaglobe.js

@@ -2070,57 +2070,97 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
             return;
         scene.fire((msgPrefix + ":splitView"), { args: [options] }, parentScene, false);
     };
-
 	//4.13
 	//淹没分析
     that.drawRange = function(type) {
         if (scene == null)
             return;
         scene.fire((msgPrefix + ":drawRange"), { args: [type] }, parentScene, false);
-    }
+    };
     that.floodAnalysis = function(options) {
         if (scene == null)
             return;
         scene.fire((msgPrefix + ":floodAnalysis"), { args: [options] }, parentScene, false);
-    }
+    };
     that.clearFloodAnalysis = function() {
-            if (scene == null)
-                return;
-            scene.fire((msgPrefix + ":clearFloodAnalysis"), { args: [] }, parentScene, false);
-        }
-        //空间分析
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":clearFloodAnalysis"), { args: [] }, parentScene, false);
+	};
+	//空间分析
     that.currencyDraw = function(type) {
         if (scene == null)
             return;
         scene.fire((msgPrefix + ":currencyDraw"), { args: [type] }, parentScene, false);
-    }
+    };
     that.intersect = function() {
         if (scene == null)
             return;
         scene.fire((msgPrefix + ":intersect"), { args: [] }, parentScene, false);
-    }
+    };
     that.spatialAnalysisClear = function() {
-            if (scene == null)
-                return;
-            scene.fire((msgPrefix + ":spatialAnalysisClear"), { args: [] }, parentScene, false);
-        }
-        //挖掘分析
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":spatialAnalysisClear"), { args: [] }, parentScene, false);
+	};
+	//挖掘分析
     that.openDigSurface = function(options) {
         if (scene == null)
             return;
         scene.fire((msgPrefix + ":openDigSurface"), { args: [options] }, parentScene, false);
-    }
+    };
     that.closeDigSurface = function() {
-            if (scene == null)
-                return;
-            scene.fire((msgPrefix + ":closeDigSurface"), { args: [] }, parentScene, false);
-        }
-        //设置图层显隐
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":closeDigSurface"), { args: [] }, parentScene, false);
+	};
+	//设置图层显隐
     that.setLayerAlpha = function(options) {
         if (scene == null)
             return;
         scene.fire((msgPrefix + ":setLayerAlpha"), { args: [options] }, parentScene, false);
-    }
+    };
+    //打开天气设置
+    that.changeWeather = function(options) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":changeWeather"), { args: [options] }, parentScene, false);
+	};
+	//关闭天气效果
+    that.closeWeather = function() {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":closeWeather"), { args: [] }, parentScene, false);
+	};
+	//模型容差
+    that.changeModelTolerance = function(options) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":changeModelTolerance"), { args: [options] }, parentScene, false);
+	};
+	//获取模型容差
+    that.getModelTolerance = function(options) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":getModelTolerance"), { args: [options] }, parentScene, false);
+	};
+	//设置天空盒
+	that.setSkyBox = function(name, imgType) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":setSkyBox"), { args: [name, imgType] }, parentScene, false);
+    };
+    //打开pbr
+    that.showPbrPanel = function(style) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":showPbrPanel"), { args: [style] }, parentScene, false);
+    };
+    that.hidePbrPanel = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":hidePbrPanel"), { args: [] }, parentScene, false);
+    };
 	that.init();
 };
 

package/egovamap/egovamap.js

@@ -4096,6 +4096,62 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
         if (globeMap != null) {
             globeMap.setLayerAlpha(options);
         }
+    };
+	//打开天气设置
+    that.changeWeather = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.changeWeather(options);
+        }
+    };
+    //关闭天气效果
+    that.closeWeather = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.closeWeather();
+        }
+    };
+    //模型容差
+    that.changeModelTolerance = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.changeModelTolerance(options);
+        }
+    };
+    //获取模型容差
+    that.getModelTolerance = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.getModelTolerance(options);
+        }
+    };
+    //设置天空盒
+    that.setSkyBox = function(name, imgType) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.setSkyBox(name, imgType);
+        }
+    };
+    //打开pbr
+    that.showPbrPanel = function(style) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.showPbrPanel(style);
+        }
+    };
+    //guanbi pbr
+    that.hidePbrPanel = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.hidePbrPanel();
+        }
     };
 	that.initMap(containerID, callback, mapType, mapConfig);
 

package/package.json

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