@@ -1382,8 +1382,6 @@ describe('mapboxgl_WebMapV2', () => {
13821382 datavizWebmap . on ( 'mapcreatesucceeded' , callback ) ;
13831383 } ) ;
13841384
1385-
1386-
13871385 it ( 'updateOverlayLayer unique' , ( done ) => {
13881386 spyOn ( FetchRequest , 'get' ) . and . callFake ( ( url ) => {
13891387 if ( url . indexOf ( 'portal.json' ) > - 1 ) {
@@ -1492,7 +1490,7 @@ describe('mapboxgl_WebMapV2', () => {
14921490 } ) ;
14931491 } ) ;
14941492
1495- it ( 'add zxytile layer' , ( done ) => {
1493+ it ( 'add zxytile layer 3857全球剖分 ' , ( done ) => {
14961494 spyOn ( FetchRequest , 'get' ) . and . callFake ( ( url ) => {
14971495 if ( url . indexOf ( 'portal.json' ) > - 1 ) {
14981496 return Promise . resolve ( new Response ( JSON . stringify ( iportal_serviceProxy ) ) ) ;
@@ -1522,6 +1520,49 @@ describe('mapboxgl_WebMapV2', () => {
15221520 } ) ;
15231521 } ) ;
15241522
1523+ it ( 'add zxytile layer 4326 world' , ( done ) => {
1524+ spyOn ( FetchRequest , 'get' ) . and . callFake ( ( url ) => {
1525+ if ( url . indexOf ( 'portal.json' ) > - 1 ) {
1526+ return Promise . resolve ( new Response ( JSON . stringify ( iportal_serviceProxy ) ) ) ;
1527+ } else if ( url . indexOf ( '/map.json' ) > - 1 ) {
1528+ return Promise . resolve ( new Response ( datavizWebmap_ZXYTILE_4326 ) ) ;
1529+ }
1530+ return Promise . resolve ( new Response ( JSON . stringify ( { } ) ) ) ;
1531+ } ) ;
1532+ const map = {
1533+ ...commonMap ,
1534+ getCRS : ( ) => {
1535+ return {
1536+ epsgCode : 'EPSG:4326' ,
1537+ unit : 'degrees' ,
1538+ getExtent : ( ) => [ - 180 , - 90 , 180 , 90 ]
1539+ } ;
1540+ }
1541+ } ;
1542+ datavizWebmap = new WebMap (
1543+ 'test' ,
1544+ {
1545+ target : 'map' ,
1546+ serverUrl : 'http://fake/fakeiportal' ,
1547+ withCredentials : false
1548+ } ,
1549+ {
1550+ style : {
1551+ version : 8 ,
1552+ sources : { } ,
1553+ layers : [ ]
1554+ }
1555+ } ,
1556+ {
1557+ map
1558+ }
1559+ ) ;
1560+ datavizWebmap . on ( 'mapcreatesucceeded' , ( { layers } ) => {
1561+ expect ( layers . length ) . toBe ( 2 ) ;
1562+ done ( ) ;
1563+ } ) ;
1564+ } ) ;
1565+
15251566 it ( 'isvj-5215' , ( done ) => {
15261567 spyOn ( FetchRequest , 'get' ) . and . callFake ( ( url ) => {
15271568 if ( url . indexOf ( 'portal.json' ) > - 1 ) {
@@ -2683,28 +2724,90 @@ describe('mapboxgl_WebMapV2', () => {
26832724 } ) ;
26842725 } ) ;
26852726
2686- it ( 'initial_xyzLayer' , ( done ) => {
2727+ it ( 'initial_xyzLayer 3857全球剖分 ' , ( done ) => {
26872728 spyOn ( FetchRequest , 'get' ) . and . callFake ( ( url ) => {
26882729 if ( url . indexOf ( 'map.json' ) > - 1 ) {
26892730 return Promise . resolve ( new Response ( JSON . stringify ( xyzLayer ) ) ) ;
26902731 } else if ( url . indexOf ( 'portal.json' ) > - 1 ) {
26912732 return Promise . resolve ( new Response ( JSON . stringify ( iportal_serviceProxy ) ) ) ;
26922733 }
2693- return Promise . resolve ( ) ;
2734+ return Promise . resolve ( new Response ( JSON . stringify ( { } ) ) ) ;
26942735 } ) ;
26952736 datavizWebmap = new WebMap ( id , {
26962737 server : server
26972738 } ) ;
26982739 datavizWebmap . on ( 'mapcreatesucceeded' , ( { map } ) => {
26992740 const layers = map . getStyle ( ) . layers ;
2700- expect ( layers . length ) . toBe ( 1 ) ;
2741+ expect ( layers . length ) . toBe ( 2 ) ;
27012742 const xyzLayer = layers [ 0 ] ;
27022743 expect ( xyzLayer . id ) . toBe ( 'OpenStreetMap' ) ;
27032744 expect ( xyzLayer . type ) . toBe ( 'raster' ) ;
2745+ const xyzLayer1 = layers [ 1 ] ;
2746+ expect ( xyzLayer1 . id ) . toBe ( 'xyz' ) ;
2747+ expect ( xyzLayer1 . type ) . toBe ( 'raster' ) ;
2748+ done ( ) ;
2749+ } ) ;
2750+ } ) ;
2751+ it ( 'initial_xyzLayer world 4326' , ( done ) => {
2752+ spyOn ( FetchRequest , 'get' ) . and . callFake ( ( url ) => {
2753+ if ( url . indexOf ( 'map.json' ) > - 1 ) {
2754+ return Promise . resolve ( new Response ( JSON . stringify ( xyzLayer4326 ) ) ) ;
2755+ } else if ( url . indexOf ( 'portal.json' ) > - 1 ) {
2756+ return Promise . resolve ( new Response ( JSON . stringify ( iportal_serviceProxy ) ) ) ;
2757+ }
2758+ return Promise . resolve ( new Response ( JSON . stringify ( { } ) ) ) ;
2759+ } ) ;
2760+ const map = {
2761+ ...commonMap ,
2762+ getCRS : ( ) => {
2763+ return {
2764+ epsgCode : 'EPSG:4326' ,
2765+ unit : 'degrees' ,
2766+ getExtent : ( ) => [ - 180 , - 90 , 180 , 90 ]
2767+ } ;
2768+ }
2769+ } ;
2770+ datavizWebmap = new WebMap ( id , {
2771+ server : server
2772+ } ) ;
2773+ datavizWebmap . on ( 'mapcreatesucceeded' , ( { map } ) => {
2774+ const layers = map . getStyle ( ) . layers ;
2775+ expect ( layers . length ) . toBe ( 2 ) ;
2776+ const xyzLayer = layers [ 1 ] ;
2777+ expect ( xyzLayer . id ) . toBe ( 'mapboxgl-256x2' ) ;
2778+ expect ( xyzLayer . type ) . toBe ( 'raster' ) ;
2779+ done ( ) ;
2780+ } ) ;
2781+ } ) ;
2782+ it ( 'initial_xyzLayer jingjin 4326' , ( done ) => {
2783+ spyOn ( FetchRequest , 'get' ) . and . callFake ( ( url ) => {
2784+ if ( url . indexOf ( 'map.json' ) > - 1 ) {
2785+ return Promise . resolve ( new Response ( JSON . stringify ( xyzLayerjingjin4326 ) ) ) ;
2786+ } else if ( url . indexOf ( 'portal.json' ) > - 1 ) {
2787+ return Promise . resolve ( new Response ( JSON . stringify ( iportal_serviceProxy ) ) ) ;
2788+ }
2789+ return Promise . resolve ( new Response ( JSON . stringify ( { } ) ) ) ;
2790+ } ) ;
2791+ const map = {
2792+ ...commonMap ,
2793+ getCRS : ( ) => {
2794+ return {
2795+ epsgCode : 'EPSG:4326' ,
2796+ unit : 'degrees' ,
2797+ getExtent : ( ) => [ - 180 , - 90 , 180 , 90 ]
2798+ } ;
2799+ }
2800+ } ;
2801+ datavizWebmap = new WebMap ( id , {
2802+ server : server ,
2803+ map
2804+ } ) ;
2805+ datavizWebmap . on ( 'xyztilelayernotsupport' , ( e ) => {
2806+ expect ( e . error ) . toBe ( `The resolutions or origin of layer jingjin on XYZ Tile does not match the map` ) ;
2807+ expect ( e . error_code ) . toBe ( `XYZ_TILE_LAYER_NOT_SUPPORTED` ) ;
27042808 done ( ) ;
27052809 } ) ;
27062810 } ) ;
2707-
27082811 it ( 'initial_mapboxstyleLayer' , ( done ) => {
27092812 spyOn ( FetchRequest , 'get' ) . and . callFake ( ( url ) => {
27102813 if ( url . indexOf ( 'map.json' ) > - 1 ) {
0 commit comments