@@ -335,11 +335,11 @@ export class WebMap extends ol.Observable {
335
335
zIndex : layerInfo . zIndex || 1 ,
336
336
visible : layerInfo . visible
337
337
} ) ;
338
- var layerId = Util . newGuid ( 8 ) ;
338
+ var layerID = Util . newGuid ( 8 ) ;
339
339
if ( layerInfo . name ) {
340
340
layer . setProperties ( {
341
341
name : layerInfo . name ,
342
- layerId : layerId
342
+ layerID : layerID
343
343
} ) ;
344
344
}
345
345
if ( ! mapInfo . baseLayer ) {
@@ -357,7 +357,7 @@ export class WebMap extends ol.Observable {
357
357
358
358
//否则没有ID,对不上号
359
359
layerInfo . layer = layer ;
360
- layerInfo . layerId = layerId ;
360
+ layerInfo . layerID = layerID ;
361
361
362
362
if ( isCallBack ) {
363
363
layer . setZIndex ( 0 ) ; // wmts
@@ -1388,11 +1388,11 @@ export class WebMap extends ol.Observable {
1388
1388
} else if ( layerInfo . layerType === "MIGRATION" ) {
1389
1389
layer = this . createMigrationLayer ( layerInfo , features ) ;
1390
1390
}
1391
- let layerId = Util . newGuid ( 8 ) ;
1391
+ let layerID = Util . newGuid ( 8 ) ;
1392
1392
if ( layer ) {
1393
1393
layerInfo . name && layer . setProperties ( {
1394
1394
name : layerInfo . name ,
1395
- layerId : layerId
1395
+ layerID : layerID
1396
1396
} ) ;
1397
1397
1398
1398
//刷新下图层,否则feature样式出不来
@@ -1415,7 +1415,7 @@ export class WebMap extends ol.Observable {
1415
1415
layer . setZIndex ( index ) ;
1416
1416
}
1417
1417
layerInfo . layer = layer ;
1418
- layerInfo . layerId = layerId ;
1418
+ layerInfo . layerID = layerID ;
1419
1419
if ( layerInfo . labelStyle && layerInfo . labelStyle . labelField && layerInfo . layerType !== "DATAFLOW_POINT_TRACK" ) {
1420
1420
//存在标签专题图
1421
1421
//过滤条件过滤feature
@@ -2030,7 +2030,6 @@ export class WebMap extends ol.Observable {
2030
2030
wrapX : false
2031
2031
} ) , labelLayer , labelSource , pathLayer , pathSource ;
2032
2032
let layer = new ol . layer . Vector ( {
2033
- layerID : layerInfo . layerId ,
2034
2033
styleOL : style ,
2035
2034
source : source
2036
2035
} ) ;
@@ -2054,7 +2053,7 @@ export class WebMap extends ol.Observable {
2054
2053
that . events . triggerEvent ( 'updateDataflowFeature' , {
2055
2054
feature : feature ,
2056
2055
identifyField : layerInfo . identifyField ,
2057
- layerID : layerInfo . layerId
2056
+ layerID : layerInfo . layerID
2058
2057
} ) ;
2059
2058
if ( layerInfo . filterCondition ) {
2060
2059
//过滤条件
@@ -2147,19 +2146,23 @@ export class WebMap extends ol.Observable {
2147
2146
let layerStyle = layer . get ( 'styleOL' ) ;
2148
2147
layer . setStyle ( feature => {
2149
2148
//有转向字段
2150
- if ( directionField && directionField !== "未设置" || directionField !== "None" ) {
2151
- let value , image ;
2149
+ let value , image ;
2150
+ if ( directionField !== undefined && directionField !== "未设置" && directionField !== "None" ) {
2152
2151
value = feature . attributes [ directionField ] ;
2153
- if ( value > 360 || value < 0 ) {
2154
- return null
2155
- }
2156
- if ( styleType === "SYMBOL_POINT" ) {
2157
- image = layerStyle . getText ( ) ;
2158
- } else {
2159
- image = layerStyle . getImage ( ) ;
2160
- }
2161
- image && image . setRotation ( value ) ;
2152
+ } else {
2153
+ value = 0 ;
2154
+ }
2155
+ if ( value > 360 || value < 0 ) {
2156
+ return null ;
2157
+ }
2158
+ if ( styleType === "SYMBOL_POINT" ) {
2159
+ image = layerStyle . getText ( ) ;
2160
+ } else {
2161
+ image = layerStyle . getImage ( ) ;
2162
2162
}
2163
+ //默认用户使用的是角度,换算成弧度
2164
+ let rotate = ( Math . PI * value ) / 180 ;
2165
+ image && image . setRotation ( rotate ) ;
2163
2166
return layerStyle ;
2164
2167
} ) ;
2165
2168
}
0 commit comments