11import maplibregl from 'maplibre-gl' ;
22import '../../libs/deck.gl/5.1.3/deck.gl' ;
3- import { Point } from '../../../src/common/commontypes/geometry/Point' ;
4- import { LineString } from '../../../src/common/commontypes/geometry/LineString' ;
5- import { DeckglLayer } from '../../../src/maplibregl/overlay/DeckglLayer' ;
3+ import { Point } from '../../../src/common/commontypes/geometry/Point' ;
4+ import { LineString } from '../../../src/common/commontypes/geometry/LineString' ;
5+ import { DeckglLayer } from '../../../src/maplibregl/overlay/DeckglLayer' ;
66
7- maplibregl . accessToken = 'pk.eyJ1IjoibW9ua2VyIiwiYSI6ImNpd2Z6aTE5YTAwdHEyb2tpOWs2ZzRydmoifQ.LwQMRArUP8Q9P7QApuOIHg ';
7+ var url = GlobeParameter . ChinaURL + '/zxyTileImage.png?z={z}&x={x}&y={y} ';
88describe ( 'maplibregl_DeckglLayer' , ( ) => {
99 var originalTimeout ;
1010 var testDiv , map , deckglLayer , features ;
1111 beforeAll ( ( done ) => {
1212 testDiv = window . document . createElement ( "div" ) ;
1313 testDiv . setAttribute ( "id" , "map" ) ;
14- testDiv . style . styleFloat = "left" ;
15- testDiv . style . marginLeft = "8px" ;
16- testDiv . style . marginTop = "50px" ;
1714 testDiv . style . width = "500px" ;
1815 testDiv . style . height = "500px" ;
1916 window . document . body . appendChild ( testDiv ) ;
20- map = new maplibregl . Map ( {
21- container : 'map' ,
22- style : 'https://demotiles.maplibre.org/style.json' ,
23- center : [ 13.413952 , 52.531913 ] ,
24- zoom : 16.000000000000004 ,
25- pitch : 33.2
26- } ) ;
2717 var pointList = [ ] ,
2818 p1 = new Point ( 20.05408801141 , 38.837029131724 ) ,
2919 p2 = new Point ( 18.80757663534 , 38.606951847395 ) ,
@@ -37,9 +27,47 @@ describe('maplibregl_DeckglLayer', () => {
3727 fieldValues : [ ] ,
3828 geometry : line
3929 } ;
40- map . on ( 'load' , function ( ) {
41- done ( ) ;
30+ map = new maplibregl . Map ( {
31+ container : 'map' ,
32+ style : {
33+ "version" : 8 ,
34+ "sources" : {
35+ 'route' : {
36+ 'type' : 'geojson' ,
37+ 'data' : {
38+ 'type' : 'Feature' ,
39+ 'properties' : { } ,
40+ 'geometry' : {
41+ 'type' : 'LineString' ,
42+ 'coordinates' : [
43+ [ - 122.483696 , 37.833818 ] ,
44+ [ - 122.493782 , 37.833683 ]
45+ ]
46+ }
47+ }
48+ }
49+ } ,
50+ "layers" : [ {
51+ 'id' : 'route' ,
52+ 'type' : 'line' ,
53+ 'source' : 'route' ,
54+ 'layout' : {
55+ 'line-join' : 'round' ,
56+ 'line-cap' : 'round'
57+ } ,
58+ 'paint' : {
59+ 'line-color' : '#888' ,
60+ 'line-width' : 8
61+ }
62+ } ]
63+ } ,
64+ center : [ 112 , 37.94 ] ,
65+ zoom : 3
4266 } ) ;
67+
68+ setTimeout ( ( ) => {
69+ done ( ) ;
70+ } , 0 )
4371 } ) ;
4472 beforeEach ( ( ) => {
4573 originalTimeout = jasmine . DEFAULT_TIMEOUT_INTERVAL ;
@@ -49,7 +77,7 @@ describe('maplibregl_DeckglLayer', () => {
4977 jasmine . DEFAULT_TIMEOUT_INTERVAL = originalTimeout ;
5078 } ) ;
5179 afterAll ( ( ) => {
52- document . body . removeChild ( testDiv ) ;
80+ // document.body.removeChild(testDiv);
5381 } ) ;
5482
5583 it ( 'onAdd_PathLayer' , ( done ) => {
@@ -141,7 +169,7 @@ describe('maplibregl_DeckglLayer', () => {
141169 var p2 = new Point ( 18.80757663534 , 38.606951847395 ) ;
142170 var p3 = new Point ( 17.43207212138 , 38.530259419285 ) ;
143171 deckglLayer = new DeckglLayer ( "scatter-plot" , {
144- data : { p1, p2, p3} ,
172+ data : { p1, p2, p3 } ,
145173 props : {
146174 radiusScale : 300 ,
147175 radiusMaxPixels : 500 ,
@@ -183,8 +211,8 @@ describe('maplibregl_DeckglLayer', () => {
183211
184212 it ( 'setData,removeFromMap' , ( done ) => {
185213 var data = [
186- { "ADDRESS" : "939 ELLIS ST" , "RACKS" : 2 , "SPACES" : 4 , "COORDINATES" : [ - 122.42177834 , 37.78346622 ] } ,
187- { "ADDRESS" : "1380 HOWARD ST" , "RACKS" : 1 , "SPACES" : 2 , "COORDINATES" : [ - 122.414411 , 37.774458 ] }
214+ { "ADDRESS" : "939 ELLIS ST" , "RACKS" : 2 , "SPACES" : 4 , "COORDINATES" : [ - 122.42177834 , 37.78346622 ] } ,
215+ { "ADDRESS" : "1380 HOWARD ST" , "RACKS" : 1 , "SPACES" : 2 , "COORDINATES" : [ - 122.414411 , 37.774458 ] }
188216 ] ;
189217 deckglLayer = new DeckglLayer ( "hexagon-layer" , {
190218 data : features ,
@@ -210,9 +238,9 @@ describe('maplibregl_DeckglLayer', () => {
210238
211239 it ( 'addData,removeData' , ( done ) => {
212240 var data = [
213- { "ADDRESS" : "939 ELLIS ST" , "RACKS" : 2 , "SPACES" : 4 , "COORDINATES" : [ - 122.42177834 , 37.78346622 ] } ,
214- { "ADDRESS" : "1380 HOWARD ST" , "RACKS" : 1 , "SPACES" : 2 , "COORDINATES" : [ - 122.414411 , 37.774458 ] } ,
215- { "ADDRESS" : "685 CHENERY ST" , "RACKS" : 1 , "SPACES" : 2 , "COORDINATES" : [ - 122.433618 , 37.73435 ] }
241+ { "ADDRESS" : "939 ELLIS ST" , "RACKS" : 2 , "SPACES" : 4 , "COORDINATES" : [ - 122.42177834 , 37.78346622 ] } ,
242+ { "ADDRESS" : "1380 HOWARD ST" , "RACKS" : 1 , "SPACES" : 2 , "COORDINATES" : [ - 122.414411 , 37.774458 ] } ,
243+ { "ADDRESS" : "685 CHENERY ST" , "RACKS" : 1 , "SPACES" : 2 , "COORDINATES" : [ - 122.433618 , 37.73435 ] }
216244 ] ;
217245 deckglLayer = new DeckglLayer ( "arc-layer" , {
218246 data : features ,
@@ -257,7 +285,7 @@ describe('maplibregl_DeckglLayer', () => {
257285 expect ( deckglLayer . deckGL . props . radius ) . toEqual ( 1000 ) ;
258286 done ( ) ;
259287 } , 0 )
260-
288+
261289 } ) ;
262290
263291 it ( 'onRemove' , ( done ) => {
0 commit comments