Skip to content

Commit 59f8e78

Browse files
committed
【fix】修复UT review by luoxiao
1 parent 8d5ce9f commit 59f8e78

File tree

5 files changed

+36
-9
lines changed

5 files changed

+36
-9
lines changed

src/leaflet/control/ChangeTileVersion.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export var ChangeTileVersion = L.Control.extend({
146146
* @param {number} tileVersions - 待更新的切片版本号。
147147
*/
148148
update: function (tileVersions) {
149-
this.tileVersions = tileVersions;
149+
this.tileVersions = tileVersions || [];
150150
this.updateLength(this.tileVersions.length);
151151
},
152152

src/openlayers/control/ChangeTileVersion.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ export class ChangeTileVersion extends Control {
345345
* @param {Object} tileVersions - 待更新的切片版本。
346346
*/
347347
update(tileVersions) {
348-
this.tileVersions = tileVersions;
348+
this.tileVersions = tileVersions ||[];
349349
this.updateLength(this.tileVersions.length);
350350
}
351351

test/common/iServer/TilesetsServiceSpec.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ describe('TilesetsService', () => {
7070
expect(analyseResult.length).toEqual(1);
7171
expect(analyseResult[0].name).toBe("smtiles_tileset_1116742863");
7272
expect(analyseResult[0].metaData.mapName).toBe("长春市区图");
73-
expect(analyseResult[0].metaData.resolutions[0]).toEqual(34.80645971);
74-
expect(analyseResult[0].metaData.resolutions[1]).toEqual(17.403229855);
75-
expect(analyseResult[0].metaData.scaleDenominators[0]).toEqual(131551.9737070866);
76-
expect(analyseResult[0].metaData.scaleDenominators[1]).toEqual(65775.9868535433);
73+
expect(analyseResult[0].metaData.resolutions[0]).toBeCloseTo(34.80645971, 0.00001);
74+
expect(analyseResult[0].metaData.resolutions[1]).toBeCloseTo(17.403229855, 0.00001);
75+
expect(analyseResult[0].metaData.scaleDenominators[0]).toBeCloseTo(131551.973707087, 0.00001);
76+
expect(analyseResult[0].metaData.scaleDenominators[1]).toBeCloseTo(65775.9868535433, 0.00001);
7777
expect(analyseResult[0].metaData.tileFormat).toBe("PNG");
7878
expect(analyseResult[0].metaData.tileType).toBe("Image");
7979
expect(analyseResult[0].metaData.tileHeight).toEqual(256);
@@ -85,7 +85,7 @@ describe('TilesetsService', () => {
8585
spyOn(FetchRequest, 'commit').and.callFake((method, testUrl, params) => {
8686
expect(method).toBe('GET');
8787
expect(testUrl).toBe(tileSetsURL + "/tilesets");
88-
return Promise.resolve(new Response(tilesetsEscapedJson));
88+
return Promise.resolve(new Response(JSON.stringify(tilesetsEscapedJson)));
8989
});
9090
tilesetsService.processAsync();
9191
});

test/leaflet/control/ChangeTileVersionSpec.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {changeTileVersion} from '../../../src/leaflet/control/ChangeTileVersion';
22
import {tiledMapLayer} from '../../../src/leaflet/mapping/TiledMapLayer';
33
import {FetchRequest} from '../../../src/common/util/FetchRequest';
4+
import { mockCreateTile } from '../../tool/mock_leaflet';
45

56
var url = GlobeParameter.ChinaProvincesURL;
67
describe('leaflet_ChangeTileVersion', () => {
@@ -15,14 +16,15 @@ describe('leaflet_ChangeTileVersion', () => {
1516
testDiv.style.width = "500px";
1617
testDiv.style.height = "500px";
1718
document.body.appendChild(testDiv);
19+
mockCreateTile()
1820
map = L.map('map', {
1921
crs: L.CRS.EPSG4326,
2022
center: [33.03, 104.79],
2123
zoom: 3,
2224
});
2325
spyOn(FetchRequest, 'get').and.callFake((testUrl, params) => {
2426
if(testUrl.indexOf('ChinaProvinces/tilesets')>-1){
25-
return Promise.resolve(new Response(tilesetsEscapedJson));
27+
return Promise.resolve(new Response(JSON.stringify(tilesetsEscapedJson)));
2628
}
2729
return Promise.resolve();
2830
});

test/resources/tilesets.js

Lines changed: 26 additions & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)