@@ -369,60 +369,61 @@ describe('MapExtend mapboxgl', () => {
369
369
on : function ( ) { } ,
370
370
off : function ( ) { }
371
371
} ;
372
- for ( const key in options ) {
373
- spyOn ( options , key ) . and . callThrough ( ) ;
374
- }
375
372
376
373
class L7LayerTest extends CustomOverlayLayer {
377
374
constructor ( ) {
378
- const optionsData = {
379
- id : 'l7_layer_1' ,
380
- sourceId : 'l7_layer_1' ,
381
- events : [ 'click' ] ,
382
- query : true ,
383
- interaction : true ,
384
- ... options
385
- } ;
386
- for ( const key in optionsData ) {
387
- this [ key ] = optionsData ;
388
- }
375
+ super ( { sourceId : 'l7_layer_1' , query : true , interaction : true , events : [ 'click' ] } ) ;
376
+ this . id = 'l7_layer_1' ;
377
+ this . sourceId = 'l7_layer_1' ;
378
+ }
379
+
380
+ getSource ( ) {
381
+ return { } ;
382
+ }
383
+
384
+ getLayer ( ) {
385
+ return { }
389
386
}
390
387
}
388
+ const l7_layer_1 = new L7LayerTest ( ) ;
389
+ for ( const key in options ) {
390
+ spyOn ( l7_layer_1 , key ) . and . callThrough ( ) ;
391
+ }
391
392
map . overlayLayersManager = {
392
- l7_layer_1 : new L7LayerTest ( ) ,
393
+ l7_layer_1,
393
394
heatmap_1 : { id : 'heatmap_1' }
394
395
} ;
395
396
expect ( map . getSource ( 'l7_layer_1' ) ) . not . toBeUndefined ( ) ;
396
397
expect ( map . getSource ( 'raster-tiles' ) ) . not . toBeUndefined ( ) ;
397
- expect ( options . getSource . calls . count ( ) ) . toEqual ( 1 ) ;
398
+ expect ( l7_layer_1 . getSource . calls . count ( ) ) . toEqual ( 1 ) ;
398
399
expect ( map . isSourceLoaded ( 'l7_layer_1' ) ) . toBeTruthy ( ) ;
399
400
expect ( map . isSourceLoaded ( 'raster-tiles' ) ) . toBeTruthy ( ) ;
400
401
expect ( map . getLayer ( 'l7_layer_1' ) ) . not . toBeUndefined ( ) ;
401
402
expect ( map . getLayer ( 'simple-tiles' ) ) . not . toBeUndefined ( ) ;
402
403
expect ( map . getLayer ( 'heatmap_1' ) ) . toEqual ( map . overlayLayersManager [ 'heatmap_1' ] ) ;
403
- expect ( options . getLayer . calls . count ( ) ) . toEqual ( 1 ) ;
404
+ expect ( l7_layer_1 . getLayer . calls . count ( ) ) . toEqual ( 1 ) ;
404
405
const layerToAdd = { type : 'custom' , id : 'add1' , onAdd ( ) { } , onRemove ( ) { } , render ( ) { } } ;
405
406
map . addLayer ( layerToAdd ) ;
406
407
expect ( map . addLayer . calls . count ( ) ) . toEqual ( 1 ) ;
407
408
map . queryRenderedFeatures ( [ 0 , 0 ] , { layers : [ 'l7_layer_1' , 'simple-tiles' ] } ) ;
408
- expect ( options . queryRenderedFeatures . calls . count ( ) ) . toEqual ( 1 ) ;
409
+ expect ( l7_layer_1 . queryRenderedFeatures . calls . count ( ) ) . toEqual ( 1 ) ;
409
410
map . querySourceFeatures ( 'l7_layer_1' ) ;
410
411
map . querySourceFeatures ( 'raster-tiles' ) ;
411
- expect ( options . querySourceFeatures . calls . count ( ) ) . toEqual ( 1 ) ;
412
+ expect ( l7_layer_1 . querySourceFeatures . calls . count ( ) ) . toEqual ( 1 ) ;
412
413
const cb = ( ) => { } ;
413
414
map . on ( 'click' , 'l7_layer_1' , cb ) ;
414
415
map . on ( 'click' , cb ) ;
415
- expect ( options . on . calls . count ( ) ) . toEqual ( 1 ) ;
416
+ expect ( l7_layer_1 . on . calls . count ( ) ) . toEqual ( 1 ) ;
416
417
map . once ( 'click' , 'l7_layer_1' , cb ) ;
417
418
map . once ( 'click' , cb ) ;
418
- expect ( options . once . calls . count ( ) ) . toEqual ( 1 ) ;
419
+ expect ( l7_layer_1 . once . calls . count ( ) ) . toEqual ( 1 ) ;
419
420
map . off ( 'click' , 'l7_layer_1' , cb ) ;
420
421
map . off ( 'click' , cb ) ;
421
- expect ( options . off . calls . count ( ) ) . toEqual ( 1 ) ;
422
+ expect ( l7_layer_1 . off . calls . count ( ) ) . toEqual ( 1 ) ;
422
423
map . removeSource ( 'l7_layer_1' ) ;
423
424
map . removeLayer ( 'simple-tiles' ) ;
424
425
map . removeSource ( 'raster-tiles' ) ;
425
- expect ( options . removeSource . calls . count ( ) ) . toEqual ( 1 ) ;
426
+ expect ( l7_layer_1 . removeSource . calls . count ( ) ) . toEqual ( 1 ) ;
426
427
map . remove ( ) ;
427
428
done ( ) ;
428
429
} ) ;
0 commit comments