@@ -105,18 +105,19 @@ module.exports = function convert(gd, calcTrace) {
105105 } ) ;
106106
107107 if ( 'angle' in trace . marker ) {
108- Lib . extendFlat ( symbol . layout , {
109- 'icon-rotation-alignment' : 'map' ,
110- 'icon-rotate' : {
111- type : 'identity' , property : 'angle'
108+ Lib . extendFlat ( symbol . layout , {
112109 // unfortunately cant use {angle} do to this issue:
113110 // https://github.com/mapbox/mapbox-gl-js/issues/873
114- } } )
111+ 'icon-rotate' : {
112+ type : 'identity' , property : 'angle'
113+ } ,
114+ 'icon-rotation-alignment' : 'map'
115+ } ) ;
115116 }
116117
117118 if ( 'allowoverlap' in trace . marker ) {
118119 Lib . extendFlat ( symbol . layout ,
119- { 'icon-allow-overlap' : trace . marker . allowoverlap } )
120+ { 'icon-allow-overlap' : trace . marker . allowoverlap } ) ;
120121 }
121122
122123
@@ -262,7 +263,7 @@ function makeSymbolGeoJSON(calcTrace, gd) {
262263 blankFillFunc ;
263264
264265 var fillAngle = ( angle ) ?
265- getFillFunc ( angle ) :
266+ getFillFunc ( angle ) :
266267 blankFillFunc ;
267268
268269 var fillText = subTypes . hasText ( trace ) ?
@@ -319,7 +320,7 @@ function getFillFunc(attr) {
319320 if ( Lib . isArrayOrTypedArray ( attr ) ) {
320321 return function ( i ) { return attr [ i ] ; } ;
321322 } else if ( attr ) {
322- return function ( i ) { return attr ; } ;
323+ return function ( ) { return attr ; } ;
323324 } else {
324325 return blankFillFunc ;
325326 }
0 commit comments