@@ -900,96 +900,34 @@ describe('openlayers_WebMap', () => {
900900 });*/
901901
902902 it ( 'createWMTSSource' , ( done ) => {
903- //第二次请求wmts参数值太大
904- spyOn ( FetchRequest , 'get' ) . and . callFake ( ( url ) => {
905- if ( url . indexOf ( 'map.json' ) > - 1 ) {
906- var mapJson = datavizWebMap_WMTS ;
907- return Promise . resolve ( new Response ( mapJson ) ) ;
908- } else if ( url . includes ( "/iserver/services/maps/wmts100?" ) ) {
909- return Promise . resolve ( new Response ( wmtsInfo2 ) ) ;
910- }
911- return Promise . resolve ( ) ;
912- } ) ;
913- var datavizWebmap = new WebMap ( id , { server : defaultServer } ) ;
914- var layerInfo = JSON . parse ( wmtsInfo ) ;
915- datavizWebmap . baseProjection = "EPSG:4326" ;
916- datavizWebmap . createWMTSSource ( layerInfo ) ;
903+ let options = {
904+ server : defaultServer ,
905+ successCallback,
906+ errorCallback : function ( ) { }
907+ } ;
917908
918- setTimeout ( ( ) => {
909+ function successCallback ( ) {
919910 expect ( datavizWebmap . server ) . toBe ( defaultServer ) ;
911+ expect ( datavizWebmap . errorCallback ) . toBeDefined ( ) ;
912+ expect ( datavizWebmap . mapParams . projection ) . toBe ( 'EPSG:3857' ) ;
913+ expect ( datavizWebmap . map . getLayers ( ) . getArray ( ) [ 1 ] . getSource ( ) . getUrls ( ) [ 0 ] ) . toBe ( 'https://fake/iserver/services/map-china400/wmts100?' ) ;
920914 done ( ) ;
921- } , 0 ) ;
922- } ) ;
923-
924- it ( 'createWMTSSource1' , ( done ) => {
925- //第二次请求wmts参数值太大
915+ }
916+ spyOn ( CommonUtil , 'isInTheSameDomain' ) . and . callFake ( ( url ) => {
917+ return true ;
918+ } ) ;
926919 spyOn ( FetchRequest , 'get' ) . and . callFake ( ( url ) => {
927920 if ( url . indexOf ( 'map.json' ) > - 1 ) {
928921 var mapJson = datavizWebMap_WMTS ;
929922 return Promise . resolve ( new Response ( mapJson ) ) ;
930- } else if ( url . includes ( "/ iserver/services/maps/wmts100?" ) ) {
923+ } else if ( url . indexOf ( " iserver/services/maps/wmts100?&SERVICE=WMTS&VERSION=1.0.0&REQUEST=GetCapabilities" ) > - 1 ) {
931924 return Promise . resolve ( new Response ( wmtsInfo2 ) ) ;
932925 }
933926 return Promise . resolve ( ) ;
934927 } ) ;
935- var datavizWebmap = new WebMap ( id , { server : defaultServer } ) ;
936- var layerInfo = JSON . parse ( wmtsInfo1 ) ;
937- datavizWebmap . baseProjection = "EPSG:4326" ;
938- datavizWebmap . createWMTSSource ( layerInfo ) ;
939-
940- setTimeout ( ( ) => {
941- expect ( datavizWebmap . server ) . toBe ( defaultServer ) ;
942- done ( ) ;
943- } , 0 ) ;
928+ var datavizWebmap = new WebMap ( id , options ) ;
944929 } ) ;
945930
946- // 被写在styleUtils
947- // it('setColorToCanvas', (done) => {
948- // spyOn(FetchRequest, 'get').and.callFake((url) => {
949- // if (url.indexOf('map.json')>-1) {
950- // var mapJson = datavizWebMap_WMTS;
951- // return Promise.resolve(new Response(mapJson));
952- // }
953- // return Promise.resolve();
954- // });
955- // var datavizWebmap = new WebMap(id, { successCallback });
956- // var canvas = document.createElement('canvas');
957- // var params = {
958- // fillColor: '#0083cb',
959- // fillOpacity: '1',
960- // strokeColor: '#56b781',
961- // strokeOpacity: '0.2',
962- // strokeWidth: '6'
963- // };
964- // function successCallback() {
965- // expect(datavizWebmap.setColorToCanvas(canvas, params)).toBeDefined();
966- // done();
967- // }
968- // });
969-
970- // it('getSymbolStyle', (done) => {
971- // spyOn(FetchRequest, 'get').and.callFake((url) => {
972- // if (url.indexOf('map.json')>-1) {
973- // var mapJson = datavizWebMap_WMTS;
974- // return Promise.resolve(new Response(mapJson));
975- // }
976- // return Promise.resolve();
977- // });
978- // var datavizWebmap = new WebMap(id, { successCallback });
979- // var params = {
980- // unicode: "",
981- // fillColor: '#ffffff',
982- // fillOpacity: '1',
983- // strokeColor: '#56b781',
984- // strokeOpacity: '0.2',
985- // strokeWidth: '6'
986- // };
987- // function successCallback() {
988- // expect(datavizWebmap.getSymbolStyle(params)).toBeDefined();
989- // done();
990- // }
991- // });
992-
993931 it ( 'changeWeight' , ( done ) => {
994932 spyOn ( FetchRequest , 'get' ) . and . callFake ( ( url ) => {
995933 if ( url . indexOf ( 'map.json' ) > - 1 ) {
0 commit comments