Skip to content

Commit 561b949

Browse files
zhushusunzhushusun
committed
修改ut ，尝试 fix ci失败 review by songym
1 parent 1fadf9b commit 561b949

File tree

2 files changed

+141
-34
lines changed

2 files changed

+141
-34
lines changed

‎test/openlayers/overlay/vectortile/MapboxStylesSpec.js‎

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ol.geom.flat = oldebug.geom.flat;
1111

1212
describe('openlayers_MapboxStyles', () => {
1313
var url = GlobeParameter.californiaURL
14-
var testDiv, map, mapboxStyles, originalTimeout;
14+
var testDiv, map, mapboxStyles, originalTimeout, stylesOptions;
1515
beforeAll(() => {
1616
testDiv = window.document.createElement("div");
1717
testDiv.setAttribute("id", "map");
@@ -32,76 +32,64 @@ describe('openlayers_MapboxStyles', () => {
3232
projection: 'EPSG:4326',
3333
})
3434
});
35+
stylesOptions = {
36+
url: url,
37+
map: map,
38+
source: 'California'
39+
};
3540
spyOn(FetchRequest, 'get').and.callFake((testUrl, params, options) => {
36-
expect(testUrl).toBe(url + "/tileFeature/vectorstyles.json?type=MapBox_GL&styleonly=true");
37-
return Promise.resolve(new Response(vectorstylesEscapedJson));
38-
});
41+
if (testUrl.indexOf("vectorstyles.json") > 0) {
42+
expect(testUrl).toBe(url + "/tileFeature/vectorstyles.json?type=MapBox_GL&styleonly=true");
43+
return Promise.resolve(new Response(JSON.stringify(vectorstylesEscapedJson)));
44+
} else if (testUrl.indexOf("sprite.json") > 0) {
45+
return Promise.resolve(new Response(JSON.stringify(spriteEscapedJson)));
46+
};
47+
return null;
48+
49+
});
3950

4051
});
4152
beforeEach(() => {
4253
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
4354
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
4455
});
4556
afterEach(() => {
57+
4658
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
4759
});
4860
afterAll(() => {
4961
window.document.body.removeChild(testDiv);
5062
});
5163

5264
it('getStyleFunction', (done) => {
53-
var stylesOptions = {
54-
url: url,
55-
map: map,
56-
source: 'California'
57-
};
5865
var style;
5966
mapboxStyles = new MapboxStyles(stylesOptions);
6067
setTimeout(() => {
6168
style = mapboxStyles.getStyleFunction();
62-
}, 8000);
63-
setTimeout(() => {
6469
expect(style).not.toBeNull();
65-
mapboxStyles = null;
6670
done();
67-
}, 1000);
71+
}, 2000);
6872
});
6973

7074
it('getStyleFunction,setSelectedId', (done) => {
71-
var stylesOptions = {
72-
url: url,
73-
map: map,
74-
source: 'California'
75-
};
7675
var style;
7776
mapboxStyles = new MapboxStyles(stylesOptions);
7877
setTimeout(() => {
7978
mapboxStyles.setSelectedId(1, 1);
8079
style = mapboxStyles.getStyleFunction();
81-
}, 8000);
82-
setTimeout(() => {
8380
expect(style).not.toBeNull();
84-
mapboxStyles = null;
8581
done();
86-
}, 1000);
82+
}, 2000);
83+
8784
});
8885

8986
it('getStylesBySourceLayer', (done) => {
90-
var stylesOptions = {
91-
url: url,
92-
map: map,
93-
source: 'California'
94-
};
9587
var layer;
9688
mapboxStyles = new MapboxStyles(stylesOptions);
9789
setTimeout(() => {
98-
layer= mapboxStyles.getStylesBySourceLayer("Military_R@California");
99-
}, 8000);
100-
setTimeout(() => {
90+
layer = mapboxStyles.getStylesBySourceLayer("Military_R@California");
10191
expect(layer).not.toBeNull();
102-
mapboxStyles = null;
10392
done();
104-
}, 1000);
105-
93+
}, 2000);
10694
});
10795
})

‎test/resources/MapboxStyles.js‎

Lines changed: 120 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,120 @@
1-
var vectorstylesEscapedJson="{\"sources\":{\"California\":{\"tiles\":[\"http://54.223.164.155:8090/iserver/services/map-mvt-California/rest/maps/California/tileFeature.mvt?returnAttributes=true&width=512&height=512&viewBounds={bbox-epsg-3857}\"],\"type\":\"vector\"}},\"name\":\"California\",\"sprite\":\"http://54.223.164.155:8090/iserver/services/map-mvt-California/rest/maps/California/tilefeature/mvtsprites/sprite@2x\",\"layers\":[{\"paint\":{\"background-color\":\"rgba(168,209,221,1.00)\"},\"id\":\"background\",\"type\":\"background\"},{\"layout\":{\"visibility\":\"visible\"},\"maxzoom\":21,\"paint\":{\"fill-color\":\"rgba(249,246,240,1.00)\",\"fill-antialias\":true},\"id\":\"Adm_R@California\",\"source\":\"California\",\"source-layer\":\"Adm_R@California\",\"type\":\"fill\",\"minzoom\":0},{\"layout\":{\"visibility\":\"visible\"},\"maxzoom\":16,\"paint\":{\"fill-color\":\"rgba(249,224,219,0.90)\",\"fill-antialias\":true},\"id\":\"Military_R@California#26\",\"source\":\"California\",\"source-layer\":\"Military_R@California\",\"type\":\"fill\",\"minzoom\":15},{\"layout\":{\"visibility\":\"visible\"},\"maxzoom\":16,\"paint\":{\"fill-color\":\"rgba(249,185,174,1.00)\",\"fill-antialias\":true},\"id\":\"Military_R@California#27\",\"source\":\"California\",\"source-layer\":\"Military_R@California\",\"type\":\"fill\",\"minzoom\":15},{\"layout\":{\"visibility\":\"visible\"},\"maxzoom\":16,\"paint\":{\"line-width\":3.02,\"line-color\":\"rgba(249,185,174,1.00)\"},\",\"id\":\"Motorway_L@California\",\"source\":\"California\",\"source-layer\":\"Motorway_L@California\",\"type\":\"line\",\"minzoom\":6},{\"filter\":[\"all\",[\"==\",\"$type\",\"Point\"],[\"has\",\"NAME\"],[\"!=\",\"NAME\",\"\"]],\"layout\":{\"icon-rotation-alignment\":\"viewport\",\"visibility\":\"visible\",\"text-field\":\"{NAME}\",\"text-size\":12.21,\"text-anchor\":\"bottom\",\"text-allow-overlap\":false,\"icon-size\":1,\"symbol-placement\":\"point\",\"icon-image\":\"marker_323_7_\",\"text-font\":[\"Microsoft YaHei Regular\"],\"text-rotate\":360,\"text-letter-spacing\":0,\"text-justify\":\"left\",\"text-rotation-alignment\":\"viewport\",\"text-ignore-placement\":false},\"maxzoom\":7,\"paint\":{\"text-halo-color\":\"rgba(255,255,255,1.00)\",\"text-color\":\"rgba(38,38,38,1.00)\",\"text-halo-width\":1,\"text-translate\":[0,-3]},\"id\":\"BigCity_P@California#1\",\"source\":\"California\",\"source-layer\":\"BigCity_P@California\",\"type\":\"symbol\",\"minzoom\":6},{\"filter\":[\"all\",[\"==\",\"$type\",\"Point\"],[\"has\",\"NAME\"],[\"!=\",\"NAME\",\"\"]],\"layout\":{\"icon-rotation-alignment\":\"viewport\",\"visibility\":\"visible\",\"text-field\":\"{NAME}\",\"text-size\":10.17,\"text-anchor\":\"bottom\",\"text-allow-overlap\":false,\"icon-size\":1,\"symbol-placement\":\"point\",\"icon-image\":\"marker_323_6_\",\"text-font\":[\"Microsoft YaHei Regular\"],\"text-rotate\":360,\"text-letter-spacing\":0,\"text-justify\":\"left\",\"text-rotation-alignment\":\"viewport\",\"text-ignore-placement\":false},\"maxzoom\":7,\"paint\":{\"text-halo-color\":\"rgba(255,255,255,1.00)\",\"text-color\":\"rgba(63,63,63,1.00)\",\"text-halo-width\":1,\"text-translate\":[0,-3]},\"id\":\"City_P@California#1\",\"source\":\"California\",\"source-layer\":\"City_P@California\",\"type\":\"symbol\",\"minzoom\":6}],\"glyphs\":\"http://54.223.164.155:8090/iserver/services/map-mvt-California/rest/maps/California/tileFeature/sdffonts/{fontstack}/{range}.pbf\",\"version\":8}";
1+
var vectorstylesEscapedJson={
2+
"sources": {
3+
"California": {
4+
"tiles": [
5+
"http://54.223.164.155:8090/iserver/services/map-mvt-California/rest/maps/California/tileFeature.mvt?returnAttributes=true&width=512&height=512&viewBounds={bbox-epsg-3857}"
6+
],
7+
"type": "vector"
8+
}
9+
},
10+
"name": "California",
11+
"sprite": "http://54.223.164.155:8090/iserver/services/map-mvt-California/rest/maps/California/tilefeature/mvtsprites/sprite@2x",
12+
"layers": [
13+
{
14+
"paint": {
15+
"background-color": "rgba(168,209,221,1.00)"
16+
},
17+
"id": "background",
18+
"type": "background"
19+
},
20+
{
21+
"layout": {
22+
"visibility": "visible"
23+
},
24+
"maxzoom": 21,
25+
"paint": {
26+
"fill-color": "rgba(249,246,240,1.00)",
27+
"fill-antialias": true
28+
},
29+
"id": "Adm_R@California",
30+
"source": "California",
31+
"source-layer": "Adm_R@California",
32+
"type": "fill",
33+
"minzoom": 0
34+
},
35+
{
36+
"layout": {
37+
"visibility": "visible"
38+
},
39+
"maxzoom": 16,
40+
"paint": {
41+
"fill-color": "rgba(249,224,219,0.90)",
42+
"fill-antialias": true
43+
},
44+
"id": "Military_R@California#26",
45+
"source": "California",
46+
"source-layer": "Military_R@California",
47+
"type": "fill",
48+
"minzoom": 15
49+
}
50+
],
51+
"glyphs": "http://54.223.164.155:8090/iserver/services/map-mvt-California/rest/maps/California/tileFeature/sdffonts/{fontstack}/{range}.pbf",
52+
"version": 8
53+
}
54+
var sprite={
55+
"BGRR_ECCDD1_11_7": {
56+
"pixelRatio": 1,
57+
"x": 276,
58+
"width": 21,
59+
"y": 37,
60+
"height": 17
61+
},
62+
"BGRR_ECCDD1_57_7": {
63+
"pixelRatio": 1,
64+
"x": 265,
65+
"width": 67,
66+
"y": 163,
67+
"height": 17
68+
},
69+
"BGRR_ECCDD1_15_7": {
70+
"pixelRatio": 1,
71+
"x": 174,
72+
"width": 25,
73+
"y": 37,
74+
"height": 17
75+
},
76+
"BGRR_ECCDD1_38_8": {
77+
"pixelRatio": 1,
78+
"x": 444,
79+
"width": 48,
80+
"y": 37,
81+
"height": 18
82+
},
83+
84+
"BGRR_FCE1D6_60_8": {
85+
"pixelRatio": 1,
86+
"x": 138,
87+
"width": 70,
88+
"y": 109,
89+
"height": 18
90+
},
91+
"BGRR_FCE1D6_60_7": {
92+
"pixelRatio": 1,
93+
"x": 145,
94+
"width": 70,
95+
"y": 91,
96+
"height": 17
97+
},
98+
"BGRR_F9E9D4_52_8": {
99+
"pixelRatio": 1,
100+
"x": 319,
101+
"width": 62,
102+
"y": 18,
103+
"height": 18
104+
},
105+
"BGRR_FCE1D6_76_8": {
106+
"pixelRatio": 1,
107+
"x": 57,
108+
"width": 86,
109+
"y": 199,
110+
"height": 18
111+
},
112+
113+
"BGRR_ECCDD1_42_8": {
114+
"pixelRatio": 1,
115+
"x": 0,
116+
"width": 52,
117+
"y": 127,
118+
"height": 18
119+
}
120+
}

0 commit comments

Comments
 (0)