Skip to content

Commit 3b3b212

Browse files
songyumengsongyumeng
committed
【fix】UT
1 parent 9ed9d08 commit 3b3b212

File tree

1 file changed

+58
-56
lines changed

1 file changed

+58
-56
lines changed

‎test/mapboxgl/mapping/WebMapSpec.js‎

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { WebMap } from '../../../src/mapboxgl/mapping/WebMap';
44
import { FetchRequest } from '@supermap/iclient-common/util/FetchRequest';
55
import { ArrayStatistic } from '../../../src/common/util/ArrayStatistic';
66
import '../../resources/WebMapV5.js';
7-
window.jsonsql = { query: () => {} };
7+
window.jsonsql = { query: () => { } };
88

99
describe('mapboxgl_WebMap', () => {
1010
// spyOn(mapboxgl, 'Map').and.callFake(mbglmap);
@@ -26,11 +26,11 @@ describe('mapboxgl_WebMap', () => {
2626
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
2727
});
2828
afterEach(() => {
29-
if (datavizWebmap && datavizWebmap.map) {
30-
datavizWebmap.map.remove();
31-
datavizWebmap.map = null;
32-
datavizWebmap = null;
33-
}
29+
if (datavizWebmap && datavizWebmap.map) {
30+
datavizWebmap.map.remove();
31+
datavizWebmap.map = null;
32+
datavizWebmap = null;
33+
}
3434
window.document.body.removeChild(testDiv);
3535
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
3636
});
@@ -78,7 +78,7 @@ describe('mapboxgl_WebMap', () => {
7878
datavizWebmap.resize();
7979
done();
8080
});
81-
81+
8282
});
8383
it('setMapId', (done) => {
8484
let options = {
@@ -93,30 +93,30 @@ describe('mapboxgl_WebMap', () => {
9393
});
9494
datavizWebmap = new WebMap(id, options);
9595
datavizWebmap.on('addlayerssucceeded', () => {
96-
datavizWebmap.setMapId('testID');
97-
expect(datavizWebmap.mapId).toEqual('testID');
98-
datavizWebmap.on('addlayerssucceeded', () => {
99-
done();
100-
});
96+
datavizWebmap.setMapId('testID');
97+
expect(datavizWebmap.mapId).toEqual('testID');
98+
datavizWebmap.on('addlayerssucceeded', () => {
99+
done();
100+
});
101101
});
102102
});
103103
it('jsonsql', (done) => {
104-
let options = {
105-
server: server
106-
};
107-
spyOn(FetchRequest, 'get').and.callFake((url) => {
108-
if (url.indexOf('map.json') > -1) {
109-
var mapJson = datavizWebMap_CLOUD;
110-
return Promise.resolve(new Response(mapJson));
111-
}
112-
return Promise.resolve();
113-
});
114-
datavizWebmap = new WebMap(id, options);
115-
datavizWebmap.on('addlayerssucceeded', () => {
116-
datavizWebmap._getFiterFeatures('2020年人口数>20', [{ properties: { '2020年人口数': 30 }}]);
117-
datavizWebmap._getFiterFeatures('观测场海拔高度（米）>150', [{ properties: { '观测场海拔高度（米）': 150 }}]);
118-
done();
119-
});
104+
let options = {
105+
server: server
106+
};
107+
spyOn(FetchRequest, 'get').and.callFake((url) => {
108+
if (url.indexOf('map.json') > -1) {
109+
var mapJson = datavizWebMap_CLOUD;
110+
return Promise.resolve(new Response(mapJson));
111+
}
112+
return Promise.resolve();
113+
});
114+
datavizWebmap = new WebMap(id, options);
115+
datavizWebmap.on('addlayerssucceeded', () => {
116+
datavizWebmap._getFiterFeatures('2020年人口数>20', [{ properties: { '2020年人口数': 30 } }]);
117+
datavizWebmap._getFiterFeatures('观测场海拔高度（米）>150', [{ properties: { '观测场海拔高度（米）': 150 } }]);
118+
done();
119+
});
120120
});
121121
it('setWebMapOptions', (done) => {
122122
let options = {
@@ -132,8 +132,10 @@ describe('mapboxgl_WebMap', () => {
132132
datavizWebmap = new WebMap(id, options);
133133
datavizWebmap.on('addlayerssucceeded', () => {
134134
datavizWebmap.setWebMapOptions({ server: 'http://www.test.com' });
135-
expect(datavizWebmap.server).toEqual('http://www.test.com/');
136-
done();
135+
datavizWebmap.on('addlayerssucceeded', () => {
136+
expect(datavizWebmap.server).toEqual('http://www.test.com/');
137+
done();
138+
})
137139
})
138140
});
139141
it('setMapOptions', (done) => {
@@ -174,15 +176,15 @@ describe('mapboxgl_WebMap', () => {
174176
datavizWebmap = new WebMap(id, options);
175177

176178
datavizWebmap.on('addlayerssucceeded', () => {
177-
expect(datavizWebmap.credentialKey).toBeUndefined();
178-
expect(datavizWebmap.credentialValue).toBeUndefined();
179+
expect(datavizWebmap.credentialKey).toBeUndefined();
180+
expect(datavizWebmap.credentialValue).toBeUndefined();
179181

180-
var map = datavizWebmap.map;
181-
expect(map.getZoom()).toBeCloseTo(2, 0.001)
182-
expect(datavizWebmap.mapParams.title).toBe('image_tianditu');
183-
expect(datavizWebmap.mapParams.description).toBe('This is a image');
184-
done();
185-
})
182+
var map = datavizWebmap.map;
183+
expect(map.getZoom()).toBeCloseTo(2, 0.001)
184+
expect(datavizWebmap.mapParams.title).toBe('image_tianditu');
185+
expect(datavizWebmap.mapParams.description).toBe('This is a image');
186+
done();
187+
})
186188
});
187189

188190
it('initialize_TIANDITU_TER', (done) => {
@@ -433,7 +435,7 @@ describe('mapboxgl_WebMap', () => {
433435
expect(datavizWebmap.mapParams.description).toBe('');
434436
done();
435437
});
436-
438+
437439
});
438440

439441
it('createThemeLayer_Range', (done) => {
@@ -688,22 +690,22 @@ describe('mapboxgl_WebMap', () => {
688690
});
689691
datavizWebmap.on('addlayerssucceeded', () => {
690692
var params =
691-
'{"layerType":"RANGE","visible":true,"themeSetting":{"themeField":"field","customSettings":{"0":{"color":"#bd10e0","segment":{"start":1, "end": 10}}},"segmentMethod":"square","segmentCount":6,"colors":["#D53E4F","#FC8D59","#FEE08B","#FFFFBF","#E6F598","#99D594","#3288BD"]},"name":"上海市可校外学习中心","featureType":"POINT","xyField":{"xField":"经度","yField":"纬度"},"style":{"strokeWidth":1,"fillColor":"#99D594","fillOpacity":0.9,"radius":5,"strokeColor":"#ffffff","type":"BASIC_POINT","strokeOpacity":1},"projection":"EPSG:4326","dataSource":{"type":"PORTAL_DATA","serverId":"1132407305"}}';
692-
var features = [];
693-
let feature = {
694-
type: 'Feature',
695-
geometry: {
696-
type: 'Point',
697-
coordinates: [116, 39]
698-
},
699-
properties: {
700-
field: 10
701-
}
702-
};
703-
features.push(feature);
704-
datavizWebmap._getRangeStyleGroup(JSON.parse(params), features);
705-
expect(ArrayStatistic.getArraySegments).toHaveBeenCalled();
706-
done();
693+
'{"layerType":"RANGE","visible":true,"themeSetting":{"themeField":"field","customSettings":{"0":{"color":"#bd10e0","segment":{"start":1, "end": 10}}},"segmentMethod":"square","segmentCount":6,"colors":["#D53E4F","#FC8D59","#FEE08B","#FFFFBF","#E6F598","#99D594","#3288BD"]},"name":"上海市可校外学习中心","featureType":"POINT","xyField":{"xField":"经度","yField":"纬度"},"style":{"strokeWidth":1,"fillColor":"#99D594","fillOpacity":0.9,"radius":5,"strokeColor":"#ffffff","type":"BASIC_POINT","strokeOpacity":1},"projection":"EPSG:4326","dataSource":{"type":"PORTAL_DATA","serverId":"1132407305"}}';
694+
var features = [];
695+
let feature = {
696+
type: 'Feature',
697+
geometry: {
698+
type: 'Point',
699+
coordinates: [116, 39]
700+
},
701+
properties: {
702+
field: 10
703+
}
704+
};
705+
features.push(feature);
706+
datavizWebmap._getRangeStyleGroup(JSON.parse(params), features);
707+
expect(ArrayStatistic.getArraySegments).toHaveBeenCalled();
708+
done();
707709
});
708710
});
709711

@@ -806,7 +808,7 @@ describe('mapboxgl_WebMap', () => {
806808
datavizWebmap.on('addlayerssucceeded', () => {
807809
datavizWebmap._getFiterFeatures('SmID>20', geojsonData);
808810
let feature =
809-
'[{ "type" : "Feature", "properties" : { "name" : "aaaa" }, "geometry" : { "type" : "Polygon", "coordinates" : [ [[92.6806640625, 35.9957853864], [92.548828125, 29.8025179058], [99.9755859375, 33.541394669], [92.6806640625, 35.9957853864]], [[110.830078125, 34.5246614718], [103.6326255336, 36.859947123], [109.7218666539, 40.599259339], [110.830078125, 34.5246614718]] ] } } ]';
811+
'[{ "type" : "Feature", "properties" : { "name" : "aaaa" }, "geometry" : { "type" : "Polygon", "coordinates" : [ [[92.6806640625, 35.9957853864], [92.548828125, 29.8025179058], [99.9755859375, 33.541394669], [92.6806640625, 35.9957853864]], [[110.830078125, 34.5246614718], [103.6326255336, 36.859947123], [109.7218666539, 40.599259339], [110.830078125, 34.5246614718]] ] } } ]';
810812
datavizWebmap._handleMultyPolygon(JSON.parse(feature));
811813
expect(datavizWebmap.credentialKey).toBeUndefined();
812814
expect(datavizWebmap.credentialValue).toBeUndefined();

0 commit comments

Comments
 (0)