@@ -1536,7 +1536,13 @@ export class WebMap extends Observable {
1536
1536
}
1537
1537
return ;
1538
1538
}
1539
- let features = that . geojsonToFeature ( data , layerInfo ) ;
1539
+ var features ;
1540
+ if ( data . type === 'CSV' || data . type === 'EXCEL' ) {
1541
+ features = that . excelData2Feature ( data . content , layerInfo ) ;
1542
+ } else {
1543
+ var geoJson = data . content ? JSON . parse ( data . content ) : data ;
1544
+ features = that . geojsonToFeature ( geoJson , layerInfo ) ;
1545
+ }
1540
1546
if ( len ) {
1541
1547
//上图
1542
1548
that . addLayer ( layerInfo , features , layerIndex ) ;
@@ -2078,6 +2084,11 @@ export class WebMap extends Observable {
2078
2084
}
2079
2085
if ( autoUpdateTime && ! layerInfo . autoUpdateInterval ) {
2080
2086
//自动更新数据
2087
+ let dataSource = layerInfo . dataSource ;
2088
+ if ( dataSource . accessType === "DIRECT" && ! dataSource . url ) {
2089
+ // 二进制数据更新feautre所需的url
2090
+ dataSource . url = `${ this . server } web/datas/${ dataSource . serverId } /content.json?pageSize=9999999¤tPage=1`
2091
+ }
2081
2092
layerInfo . autoUpdateInterval = setInterval ( ( ) => {
2082
2093
that . updateFeaturesToMap ( layerInfo , index , true ) ;
2083
2094
} , autoUpdateTime ) ;
@@ -2102,7 +2113,8 @@ export class WebMap extends Observable {
2102
2113
updateFeaturesToMap ( layerInfo , layerIndex ) {
2103
2114
let that = this , dataSource = layerInfo . dataSource , url = layerInfo . dataSource . url ,
2104
2115
dataSourceName = dataSource . dataSourceName || layerInfo . name ;
2105
- if ( dataSource . type === "USER_DATA" ) {
2116
+
2117
+ if ( dataSource . type === "USER_DATA" || dataSource . accessType === "DIRECT" ) {
2106
2118
that . addGeojsonFromUrl ( layerInfo , null , layerIndex )
2107
2119
} else {
2108
2120
let requestUrl = that . getRequestUrl ( url ) ;
0 commit comments