egovamap 0.15.19 → 0.15.22

package/egovamap/egovaBI.js

@@ -300,7 +300,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
         }
         return label;
     };
-    this.drawParts = function (options, data) {
+    this.drawParts = function (options, data, callback) {
         var self = this;
         function showParts(data) {
             var drawParam = options.drawParam || {};
@@ -366,6 +366,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                             symbolUrl: symbolUrl,
                         });
                     }));
+                    callback && callback(dataList);
                     showParts(dataList);
                 };
                 if (gisMap) {

package/egovamap/egovagis.js

@@ -631,7 +631,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		that.locateFeatureByIDs(layerID, layerKeyFieldName, cellID, bClearMap, gridCellStyle.style, gridCellStyle.hStyle, zoom);
 	}
 	/* 标识位置 */
-	that.markMap = function(projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName,point) {
+	that.markMap = function(projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName,point,symbolUrl) {
 		if (scene == null)
 			return;
 
@@ -650,8 +650,8 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 			});
 		}
 		scene.fire(msgPrefix + ":markMap", {
-			args : [ projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, cellIndexName,point]
-		}, parentScene, false);
+			args : [ projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, cellIndexName,point, symbolUrl]
+		  }, parentScene, false);
 	}
 	/* 案件定位 */
 	that.eventLocate = that.recLocate = function(eventID, defaultMapRange) {

package/egovamap/egovagisviewer.js

@@ -928,7 +928,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         that.callMap('locateFeatureByIDs', layerID, layerKeyFieldName, cellID, bClearMap, gridCellStyle.style, gridCellStyle.hStyle, zoom);
     }
     /* 标识位置 */
-    that.markMap = function (projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName, point, option, symbolUrl) {
+    that.markMap = function (projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName, point, symbolUrl) {
         if (scene == null)
             return;
 

package/egovamap/egovaglobe.js

@@ -1945,7 +1945,126 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
             return;
         scene.fire((msgPrefix + ":getPointInfo"), { args: [options] }, parentScene, false);
     };
-
+    //添加聚类图层
+    that.addClusterLayerCIM = function(dataInfo, option) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":addClusterLayer"), { args: [dataInfo, option] }, parentScene, false);
+    };
+	//可视域分析	
+	that.startViewer = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":startViewer"), { args: [options] }, parentScene, false);
+    };
+	that.removeViewer = function() {
+	    if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":removeViewer"), { args: [] }, parentScene, false);
+    };
+    that.setViewerOptions = function(options) {
+	    if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":setViewerOptions"), { args: [options] }, parentScene, false);
+    };
+    that.showSkyLine = function(options) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":showSkyLine"), { args: [options] }, parentScene, false);
+    };
+	that.clearSkyLine = function() {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":clearSkyLine"), { args: [] }, parentScene, false);
+    };
+    that.setLineOptions = function(options) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":setLineOptions"), { args: [options] }, parentScene, false);
+    };
+	that.bufferAnalysis = function(options,clear,update) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":bufferAnalysis"), { args: [options,clear,update] }, parentScene, false);
+    };
+    that.clearBufferAnalysis = function(options) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":clearBufferAnalysis"), { args: [] }, parentScene, false);
+    };
+    that.addModelClickEvent = function(callback) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":addModelClickEvent"), { args: [callback] }, parentScene, false);
+    };
+    that.removeModelClickEvent = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":removeModelClickEvent"), { args: [] }, parentScene, false);
+    };
+    that.getBIMTree = function(option, callback) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":getBIMTree"), { args: [option, callback] }, parentScene, false);
+    };
+    that.setBIMTree = function(option) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":setBIMTree"), { args: [option] }, parentScene, false);
+    };
+    that.clearBimSelect = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":clearBimSelect"), { args: [] }, parentScene, false);
+    };
+    that.visibilityAnalysis = function(type) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":visibilityAnalysis"), { args: [type] }, parentScene, false);
+    };
+    that.clearVisibilityAnalysis = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":clearVisibilityAnalysis"), { args: [] }, parentScene, false);
+    };
+    that.addCIMTerrain = function(options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":addCIMTerrain"), { args: [options] }, parentScene, false);
+    };
+    that.flytoPosition = function(lon, lat, height) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":flytoPosition"), { args: [lon, lat, height] }, parentScene, false);
+    };
+    //开启日照分析
+    that.openSunshineAnalysis = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":openSunshineAnalysis"), { args: [] }, parentScene, false);
+    };
+    that.sunshineAnalysis = function(date) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":sunshineAnalysis"), { args: [date] }, parentScene, false);
+    };
+    that.closeSunshineAnalysis = function() {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":closeSunshineAnalysis"), { args: [] }, parentScene, false);
+    };
+    //设置天气
+    that.setViewConfig = function(type, options) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":setViewConfig"), { args: [type, options] }, parentScene, false);
+    };
+	//管网高亮显示
+    that.searchAndShowPipe = function(url, options, color, clear) {
+        if (scene == null)
+            return;
+        scene.fire((msgPrefix + ":searchAndShowPipe"), { args: [url, options, color, clear] }, parentScene, false);
+    };
 	that.init();
 };
 

package/egovamap/egovamap.js

@@ -1822,7 +1822,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	}
 
 	/* 标识位置 */
-	that.markMap = function (projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName, point) {
+	that.markMap = function (projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName, point, symbolUrl) {
 		if (scene == null)
 			return;
 		if (gisMap != null && gisMap.gisVisible) {
@@ -3855,7 +3855,173 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
             globeMap.getPointInfo(options);
         }
     };
+    /* 聚类 */
+    that.addClusterLayerCIM = function(dataInfo, option) {
+        if (scene == null)
+            return;
 
+        if (globeMap != null) {
+            globeMap.addClusterLayerCIM(dataInfo, option);
+        }
+    };
+	//可视域分析
+	that.startViewer = function(options) {
+	    if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.startViewer(options);
+		}
+    };
+	that.removeViewer = function() {
+	    if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.removeViewer();
+		}
+    };
+    that.setViewerOptions = function(options) {
+	    if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.setViewerOptions(options);
+		}
+    };
+    that.showSkyLine = function(options) {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.showSkyLine(options);
+		}
+    };
+    that.clearSkyLine = function() {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.clearSkyLine();
+		}
+    };  
+    that.setLineOptions = function(options) {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.setLineOptions(options);
+		}
+    };
+    that.bufferAnalysis = function(options,clear,update) {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.bufferAnalysis(options,clear,update);
+		}
+    };  
+    that.clearBufferAnalysis = function() {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.clearBufferAnalysis();
+		}
+    };	
+    that.addModelClickEvent = function(callback) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.addModelClickEvent(callback);
+        }
+    };
+    that.removeModelClickEvent = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.removeModelClickEvent();
+        }
+    };
+    that.getBIMTree = function(options, callback) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.getBIMTree(options, callback);
+        }
+    };
+    that.setBIMTree = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.setBIMTree(options);
+        }
+    };
+    that.clearBimSelect = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.clearBimSelect();
+        }
+    };
+    that.visibilityAnalysis = function(type) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.visibilityAnalysis(type);
+        }
+    };
+    that.clearVisibilityAnalysis = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.clearVisibilityAnalysis();
+        }
+    };
+    that.addCIMTerrain = function(options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.addCIMTerrain(options);
+        }
+    }
+    that.flytoPosition = function(lon, lat, height) {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.flytoPosition(lon, lat, height);
+		}
+	};
+	//开启日照分析
+    that.openSunshineAnalysis = function() {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.openSunshineAnalysis();
+        }
+    };
+    that.sunshineAnalysis = function(date) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.sunshineAnalysis(date);
+        }
+    };
+    that.closeSunshineAnalysis = function() {
+		if (scene == null)
+			return;
+		if (globeMap != null) {
+			globeMap.closeSunshineAnalysis();
+		}
+	};
+	//设置天气
+    that.setViewConfig = function(type, options) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.setViewConfig(type, options);
+        }
+    };
+	//管网高亮显示
+    that.searchAndShowPipe = function(url, options, color, clear) {
+        if (scene == null)
+            return;
+        if (globeMap != null) {
+            globeMap.searchAndShowPipe(url, options, color, clear);
+        }
+    };		
 	that.initMap(containerID, callback, mapType, mapConfig);
 
 	// EGovaBI(globeMap).bind(this)();

package/package.json

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