egovamap 0.28.0 → 0.28.2

package/egovamap/coordconvert/CoordConvConfig.js

@@ -1,5 +1,5 @@
-var CoordConvConfig={
-		coordConvert4Params:'-47363.969#-4112623.75#0.0039286694040273984#1.0000046699602922#0#116.0',
-		coordConvert4ParamsReverse:'31175.966131687164#4112791.5852928162#-0.003850255399136165#1.0000100832629242#0#116.0'
-	}
-	export default CoordConvConfig;
+var CoordConvConfig={
+		coordConvert4Params:'-47363.969#-4112623.75#0.0039286694040273984#1.0000046699602922#0#116.0',
+		coordConvert4ParamsReverse:'31175.966131687164#4112791.5852928162#-0.003850255399136165#1.0000100832629242#0#116.0'
+	}
+	export default CoordConvConfig;

package/egovamap/egovaBI.js

@@ -58,7 +58,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
 
     function rgbToRgbArray(color) {
         if (!color || typeof color !== 'string' || (typeof color == 'string'&&color.indexOf('rgb') == -1) ) return color;
-	
+
         var r, g, b, a;
         var rgbaAttr = color.match(/[\d.]+/g);
         if (rgbaAttr.length >= 3) {
@@ -359,7 +359,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                         return Promise.resolve(undefined)
                     }
                 })
-          
+
         }
         let queryParams = {
             layerID: options.usageID,
@@ -393,10 +393,10 @@ var egovaBI = function(globeMap, gisMap, mapType){
             if(errorSize>0){
                 console.error(`${errorSize}个点格式错误，无法正常加载`);
             }
-            
+
             drawData(layerName, dataCache, options);
         })
-       
+
     }
     this.getLabel = function (attributes) {
         if (!attributes) return;
@@ -498,7 +498,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     if (features.length == 0) {
                         callback && callback([]);
                         return;
-                    }					
+                    }
                     if (!features || !features.length) return;
                     var symbolUrl = "";
                     if (subUniqueCode.indexOf("http") > -1) {
@@ -640,7 +640,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
             if (!globeMap) {
                 return;
             }
-            
+
             if (geomType == 2) {
                 var infoJson = features.map((feature) => {
                     var paths = feature.geometry.paths[0];
@@ -710,7 +710,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                 globeMap.showPolygon(infoJson, drawWay, zoom, clear, options, layerName, drawParam.clickCallback);
             }
         }
-    
+
         if (data) {
             showParts(data);
         } else {
@@ -1111,7 +1111,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                   options.eventSetting.mouseMoveCallback
               );
                   }
-                  
+
                 }
               }
             if(dataLoadCb){
@@ -1164,7 +1164,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                             console.log("complete");
                         }
                     }
-    
+
                 }
             }
         }
@@ -1225,7 +1225,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                     options.layerTag,
                     options.callback
                 );
-            } 
+            }
         }
 
         // 主逻辑
@@ -1275,13 +1275,33 @@ var egovaBI = function(globeMap, gisMap, mapType){
         }
         return list;
     }
-    
+
+    // 屏幕坐标转地理坐标
+    this.convertScreenToMap=function (list) {
+        if (gisMap != null) {
+           return gisMap.convertScreenToMap(list);
+        }
+        return list;
+    }
+
 	//设置地下模式悟空
     this.SetTerrainAlpha = function(alpha) {
         if (globeMap != null) {
             globeMap.onUndergroundModel(alpha);
         }
     };
+
+    // 新版通用接口
+    // 适配热力图，具体参数转换等逻辑在引擎层面实现，确保
+    this.heatMap = function (options, cb) {
+        let mapInstance
+        if (globeMap != null && mapType == 'globe') {
+            mapInstance = globeMap;
+        } else if (gisMap != null && mapType == 'map') {
+            mapInstance = gisMap;
+        }
+        mapInstance.heatMap(options, cb);
+    }
 }
 
 

package/egovamap/egovagisviewer.js

@@ -19,7 +19,7 @@ function setCookie(name, value) {
 
 function checkGisServerURL(url, callback) {
 	if(!url) return;
-	
+
     var cookieUrl = getCookie("gisUrl");
     var gisProxyList = url.split(";");
     cookieUrl && gisProxyList.push(cookieUrl);
@@ -287,7 +287,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     }
     that.loadGISLibrary = function (gisServerURL) {
         var t = (new Date()).getTime();
-        if(gisServerURL !== _egovagisviewerUrl && _egovagisviewerUrl){  
+        if(gisServerURL !== _egovagisviewerUrl && _egovagisviewerUrl){
             //如果第二次的GIS地址与上次不一致则删除上一次的，不考虑同一页面多个地图，地图GIS地址不一致的情况。（页面中始终只存在一个引用egovaviewer.js）
             var curScript = document.querySelector('script[egoavagisviewer="' + _egovagisviewerUrl +'"]');
             var curLink = document.querySelector('link[egoavagisviewer="' + _egovagisviewerUrl +'"]');
@@ -570,7 +570,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         var cb = function (type, data) {
             if (callback && type == 'locateFeatureByIDsCallback'){
                 callback(data);
-            } 
+            }
             if (mouseMoveCallback && type != 'locateFeatureByIDsCallback'){
                 mouseMoveCallback(type, data);
             }
@@ -791,7 +791,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
                 return;
             }
         }
-		
+
         var cb = function (type, data) {
             if (clickCallback && type == 'showRecListDistributionCallback')
                 clickCallback(data);
@@ -1385,7 +1385,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         params.push(cb);
         that.callMap.apply(that, params);
     }
-	
+
 	that.stopEdit = function() {
         if (scene == null)
             return;
@@ -1440,7 +1440,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         };
         that.callMap('drawGeometry', type, style, clear, cb, options);
     }
-    
+
     /* 热力图*/
     that.addHeatMap = function (data, option) {
         that.callMap('addHeatMap', data, option);
@@ -1609,7 +1609,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
             'yFieldName': yFieldName
         };
 		if(params) queryParam = MapUtils.deepClones(true, {}, queryParam, params);
-                    
+
         var cb = function (type, data) {
             if (callback && type == 'queryObjectInfoCallback') {
                 callback(data);
@@ -1777,6 +1777,11 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         return that.callMap('convertMapToScreen', list);
     }
 
+    // 屏幕坐标转地理坐标
+    that.convertScreenToMap = function (list) {
+        return that.callMap('convertScreenToMap', list);
+    }
+
     that.destroyMap = function () {
         that.callMap('destroyMap');
     }
@@ -1867,7 +1872,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     that.clearLayerSelectStyle = function (id, options) {
         that.callMap('clearLayerSelectStyle', id, options);
     }
-	
+
 	that.getLayersByLayerGroup = function (layerGroupName, callback) {
         that.callMap('getLayersByLayerGroup', layerGroupName, callback);
     }
@@ -1922,6 +1927,11 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     that.zoomOut = function () {
         that.callMap('zoomOut');
     }
+
+    that.heatMap = function(options, cb) {
+        that.callMap('agsToWKT', options, cb);
+    }
+
     that.init();
 }
 

package/egovamap/egovaglobe.js

@@ -2204,6 +2204,11 @@ var EGovaGlobeMap = function ($container, pScene, prefix, mapConfig, context, ca
             return;
         scene.fire((msgPrefix + ":wmsLayerPick"), { args: [options, cb] }, parentScene, false);
     };
+	that.heatMap = function (options, cb) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":heatMap"), { args: [options, cb] }, parentScene, false);
+	}
 	that.init();
 };