@@ -335,11 +335,11 @@ export class WebMap extends ol.Observable {
335335 zIndex : layerInfo . zIndex || 1 ,
336336 visible : layerInfo . visible
337337 } ) ;
338- var layerId = Util . newGuid ( 8 ) ;
338+ var layerID = Util . newGuid ( 8 ) ;
339339 if ( layerInfo . name ) {
340340 layer . setProperties ( {
341341 name : layerInfo . name ,
342- layerId : layerId
342+ layerID : layerID
343343 } ) ;
344344 }
345345 if ( ! mapInfo . baseLayer ) {
@@ -357,7 +357,7 @@ export class WebMap extends ol.Observable {
357357
358358 //否则没有ID,对不上号
359359 layerInfo . layer = layer ;
360- layerInfo . layerId = layerId ;
360+ layerInfo . layerID = layerID ;
361361
362362 if ( isCallBack ) {
363363 layer . setZIndex ( 0 ) ; // wmts
@@ -1388,11 +1388,11 @@ export class WebMap extends ol.Observable {
13881388 } else if ( layerInfo . layerType === "MIGRATION" ) {
13891389 layer = this . createMigrationLayer ( layerInfo , features ) ;
13901390 }
1391- let layerId = Util . newGuid ( 8 ) ;
1391+ let layerID = Util . newGuid ( 8 ) ;
13921392 if ( layer ) {
13931393 layerInfo . name && layer . setProperties ( {
13941394 name : layerInfo . name ,
1395- layerId : layerId
1395+ layerID : layerID
13961396 } ) ;
13971397
13981398 //刷新下图层,否则feature样式出不来
@@ -1415,7 +1415,7 @@ export class WebMap extends ol.Observable {
14151415 layer . setZIndex ( index ) ;
14161416 }
14171417 layerInfo . layer = layer ;
1418- layerInfo . layerId = layerId ;
1418+ layerInfo . layerID = layerID ;
14191419 if ( layerInfo . labelStyle && layerInfo . labelStyle . labelField && layerInfo . layerType !== "DATAFLOW_POINT_TRACK" ) {
14201420 //存在标签专题图
14211421 //过滤条件过滤feature
@@ -2030,7 +2030,6 @@ export class WebMap extends ol.Observable {
20302030 wrapX : false
20312031 } ) , labelLayer , labelSource , pathLayer , pathSource ;
20322032 let layer = new ol . layer . Vector ( {
2033- layerID : layerInfo . layerId ,
20342033 styleOL : style ,
20352034 source : source
20362035 } ) ;
@@ -2054,7 +2053,7 @@ export class WebMap extends ol.Observable {
20542053 that . events . triggerEvent ( 'updateDataflowFeature' , {
20552054 feature : feature ,
20562055 identifyField : layerInfo . identifyField ,
2057- layerID : layerInfo . layerId
2056+ layerID : layerInfo . layerID
20582057 } ) ;
20592058 if ( layerInfo . filterCondition ) {
20602059 //过滤条件
@@ -2147,19 +2146,23 @@ export class WebMap extends ol.Observable {
21472146 let layerStyle = layer . get ( 'styleOL' ) ;
21482147 layer . setStyle ( feature => {
21492148 //有转向字段
2150- if ( directionField && directionField !== "未设置" || directionField !== "None" ) {
2151- let value , image ;
2149+ let value , image ;
2150+ if ( directionField !== undefined && directionField !== "未设置" && directionField !== "None" ) {
21522151 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 ( ) ;
21622162 }
2163+ //默认用户使用的是角度,换算成弧度
2164+ let rotate = ( Math . PI * value ) / 180 ;
2165+ image && image . setRotation ( rotate ) ;
21632166 return layerStyle ;
21642167 } ) ;
21652168 }
0 commit comments