Skip to content

Commit 4e1131d

Browse files
luoxiao-supermapluoxiao-supermap
committed
[fix]UT
1 parent b68755e commit 4e1131d

File tree

2 files changed

+50
-9
lines changed

2 files changed

+50
-9
lines changed

‎src/openlayers/mapping/WebMap.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ export class WebMap extends Observable {
619619
let capabilities = format.read(capabilitiesText);
620620

621621
let content = capabilities.Contents;
622-
let tileMatrixSet = content.TileMatrixSet;
622+
let tileMatrixSet = content.TileMatrixSet;
623623
let scales = [];
624624
for (let i = 0; i < tileMatrixSet.length; i++) {
625625
if (tileMatrixSet[i].Identifier === identifier) {

‎test/openlayers/mapping/WebMapSpec.js‎

Lines changed: 49 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ describe('openlayers_WebMap', () => {
737737
if (url.indexOf('map.json') > -1) {
738738
var mapJson = datavizWebMap_WMTS;
739739
return Promise.resolve(new Response(mapJson));
740-
} else if (url.includes("http://localhost:9876/iserver/services/maps/wmts100?") > -1) {
740+
} else if (url.includes("/iserver/services/maps/wmts100?")) {
741741
return Promise.resolve(new Response(wmtsInfo2));
742742
}
743743
return Promise.resolve();
@@ -759,7 +759,7 @@ describe('openlayers_WebMap', () => {
759759
if (url.indexOf('map.json') > -1) {
760760
var mapJson = datavizWebMap_WMTS;
761761
return Promise.resolve(new Response(mapJson));
762-
} else if (url.includes("http://localhost:9876/iserver/services/maps/wmts100?") > -1) {
762+
} else if (url.includes("/iserver/services/maps/wmts100?")) {
763763
return Promise.resolve(new Response(wmtsInfo2));
764764
}
765765
return Promise.resolve();
@@ -827,7 +827,7 @@ describe('openlayers_WebMap', () => {
827827
if (url.indexOf('map.json') > -1) {
828828
var mapJson = datavizWebMap_WMTS;
829829
return Promise.resolve(new Response(mapJson));
830-
} else if (url.includes("http://localhost:9876/iserver/services/maps/wmts100?") > -1) {
830+
} else if (url.includes("/iserver/services/maps/wmts100?")) {
831831
return Promise.resolve(new Response(wmtsInfo2));
832832
}
833833
return Promise.resolve();
@@ -854,7 +854,7 @@ describe('openlayers_WebMap', () => {
854854
if (url.indexOf('map.json') > -1) {
855855
var mapJson = datavizWebMap_WMTS;
856856
return Promise.resolve(new Response(mapJson));
857-
} else if (url.includes("http://localhost:9876/iserver/services/maps/wmts100?") > -1) {
857+
} else if (url.includes("/iserver/services/maps/wmts100?")) {
858858
return Promise.resolve(new Response(wmtsInfo2));
859859
}
860860
return Promise.resolve();
@@ -875,7 +875,7 @@ describe('openlayers_WebMap', () => {
875875
done();
876876
}, 0);
877877
function errorCallback(error) {
878-
console.log('---------', error)
878+
console.log(error);
879879
}
880880
});
881881

@@ -885,7 +885,7 @@ describe('openlayers_WebMap', () => {
885885
if (url === requestUrl) {
886886
var mapJson = datavizWebMap_WMTS;
887887
return Promise.resolve(new Response(mapJson));
888-
} else if (url.includes("http://localhost:9876/iserver/services/maps/wmts100?") > -1) {
888+
} else if (url.includes("/iserver/services/maps/wmts100?")) {
889889
return Promise.resolve(new Response(wmtsInfo2));
890890
} else {
891891
let wmtsData = '<Capabilities xmlns="http://www.opengis.net/wmts/1.0" xmlns:gml="http://www.opengis.net/gml" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0.0" xsi:schemaLocation="http://www.opengis.net/wmts/1.0 http://localhost:9876/iserver/services/map-world/wmts100/wmts,1.0,wmtsGetCapabilities_response.xsd"><<ows:OperationsMetadata><<ows:Operation name="GetCapabilities"></ows:Operation></ows:OperationsMetadata></Capabilities>';
@@ -1047,7 +1047,7 @@ describe('openlayers_WebMap', () => {
10471047
if (url.indexOf('map.json') > -1) {
10481048
var mapJson = datavizWebMap_WMTS;
10491049
return Promise.resolve(new Response(mapJson));
1050-
} else if (url.includes("http://localhost:9876/iserver/services/maps/wmts100?") > -1) {
1050+
} else if (url.includes("/iserver/services/maps/wmts100?")) {
10511051
return Promise.resolve(new Response(wmtsInfo2));
10521052
}
10531053
return Promise.resolve();
@@ -1073,7 +1073,7 @@ describe('openlayers_WebMap', () => {
10731073
if (url.indexOf('map.json') > -1) {
10741074
var mapJson = datavizWebMap_WMTS;
10751075
return Promise.resolve(new Response(mapJson));
1076-
} else if (url.includes("http://localhost:9876/iserver/services/maps/wmts100?") > -1) {
1076+
} else if (url.includes("/iserver/services/maps/wmts100?")) {
10771077
return Promise.resolve(new Response(wmtsInfo2));
10781078
}
10791079
return Promise.resolve();
@@ -1093,4 +1093,45 @@ describe('openlayers_WebMap', () => {
10931093
done();
10941094
}, 0);
10951095
});
1096+
it('svg canvg', (done) => {
1097+
let options = {
1098+
server: server,
1099+
successCallback,
1100+
errorCallback: function () {}
1101+
};
1102+
spyOn(FetchRequest, 'get').and.callFake((url) => {
1103+
if (url.indexOf('map.json') > -1) {
1104+
var mapJson = datavizWebMap_SVG;
1105+
return Promise.resolve(new Response(mapJson));
1106+
} else if (url.indexOf('content.json') > -1) {
1107+
return Promise.resolve(new Response(markerData));
1108+
}
1109+
return Promise.resolve();
1110+
});
1111+
1112+
var datavizWebmap = new WebMap(id, options);
1113+
function successCallback() {
1114+
expect(datavizWebmap.server).toBe(server);
1115+
datavizWebmap.stop
1116+
done();
1117+
}
1118+
});
1119+
1120+
it('vector_svg', (done) => {
1121+
spyOn(FetchRequest, 'get').and.callFake((url) => {
1122+
if (url.indexOf('map.json') > -1) {
1123+
var mapJson = datavizWebMap_SVG1;
1124+
return Promise.resolve(new Response(mapJson));
1125+
} else if (url.indexOf('content.json') > -1) {
1126+
return Promise.resolve(new Response(geojsonData));
1127+
}
1128+
return Promise.resolve();
1129+
});
1130+
var datavizWebmap = new WebMap(id, { server, successCallback });
1131+
function successCallback() {
1132+
expect(datavizWebmap.credentialKey).toBeUndefined();
1133+
expect(datavizWebmap.credentialValue).toBeUndefined();
1134+
done();
1135+
}
1136+
});
10961137
});

0 commit comments

Comments
 (0)