Skip to content

Commit 8c664c6

Browse files
tangqinGisertangqinGiser
committed
【FIX】fix CI 挂掉的UT，新增 ol/l mapv 的测试。
1 parent d1934aa commit 8c664c6

File tree

7 files changed

+173
-300
lines changed

7 files changed

+173
-300
lines changed

‎test/leaflet/overlay/GraphicLayerSpec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import '../../libs/deck.gl/5.1.3/deck.gl';
12
import {graphicLayer} from '../../../src/leaflet/overlay/GraphicLayer';
23
import {tiledMapLayer} from '../../../src/leaflet/mapping/TiledMapLayer';
34
import {circleStyle} from '../../../src/leaflet/overlay/graphic/CircleStyle';

‎test/leaflet/overlay/graphic/GraphicSpec.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,9 @@ describe('leaflet_Graphic', () => {
3131
expect(graphic.getAttributes().type).toBe("point");
3232
graphic = null;
3333
});
34+
it("getCanvas", () => {
35+
graphic = graphicObj(option);
36+
expect(graphic.getCanvas()).toBeUndefined();
37+
graphic = null;
38+
});
3439
});

‎test/mapboxgl/overlay/DeckglLayerSpec.js

Lines changed: 12 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import mapboxgl from 'mapbox-gl';
22
import '../../libs/deck.gl/5.1.3/deck.gl';
3-
import { Point } from '../../../src/common/commontypes/geometry/Point';
4-
import { LineString } from '../../../src/common/commontypes/geometry/LineString';
5-
import { DeckglLayer } from '../../../src/mapboxgl/overlay/DeckglLayer';
3+
import {Point} from '../../../src/common/commontypes/geometry/Point';
4+
import {LineString} from '../../../src/common/commontypes/geometry/LineString';
5+
import {DeckglLayer} from '../../../src/mapboxgl/overlay/DeckglLayer';
66

77
mapboxgl.accessToken = 'pk.eyJ1IjoibW9ua2VyIiwiYSI6ImNpd2Z6aTE5YTAwdHEyb2tpOWs2ZzRydmoifQ.LwQMRArUP8Q9P7QApuOIHg';
88
describe('mapboxgl_DeckglLayer', () => {
@@ -140,7 +140,7 @@ describe('mapboxgl_DeckglLayer', () => {
140140
var p2 = new Point(18.80757663534, 38.606951847395);
141141
var p3 = new Point(17.43207212138, 38.530259419285);
142142
deckglLayer = new DeckglLayer("scatter-plot", {
143-
data: {p1,p2,p3},
143+
data: {p1, p2, p3},
144144
props: {
145145
radiusScale: 300,
146146
radiusMaxPixels: 500,
@@ -158,11 +158,11 @@ describe('mapboxgl_DeckglLayer', () => {
158158
getColor: function (feature) {
159159
if (feature.Magnitude >= 2.5 && feature.Magnitude <= 3.31) {
160160
return [118, 42, 131];
161-
}
161+
}
162162
return [0, 0, 0, 0]
163163
},
164164
getRadius: function (feature) {
165-
165+
166166
return Math.pow(Number(feature.Magnitude), 2.5);
167167
}
168168
}
@@ -182,8 +182,8 @@ describe('mapboxgl_DeckglLayer', () => {
182182

183183
it('setData,removeFromMap', (done) => {
184184
var data = [
185-
{ "ADDRESS": "939 ELLIS ST", "RACKS": 2, "SPACES": 4, "COORDINATES": [-122.42177834, 37.78346622] },
186-
{ "ADDRESS": "1380 HOWARD ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.414411, 37.774458] }
185+
{"ADDRESS": "939 ELLIS ST", "RACKS": 2, "SPACES": 4, "COORDINATES": [-122.42177834, 37.78346622]},
186+
{"ADDRESS": "1380 HOWARD ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.414411, 37.774458]}
187187
];
188188
deckglLayer = new DeckglLayer("hexagon-layer", {
189189
data: features,
@@ -211,15 +211,15 @@ describe('mapboxgl_DeckglLayer', () => {
211211
expect(deckglLayer.data.length).toEqual(0);
212212
done();
213213
}, 3000)
214-
214+
215215

216216
});
217217

218218
it('addData,removeData', (done) => {
219219
var data = [
220-
{ "ADDRESS": "939 ELLIS ST", "RACKS": 2, "SPACES": 4, "COORDINATES": [-122.42177834, 37.78346622] },
221-
{ "ADDRESS": "1380 HOWARD ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.414411, 37.774458] },
222-
{ "ADDRESS": "685 CHENERY ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.433618, 37.73435] }
220+
{"ADDRESS": "939 ELLIS ST", "RACKS": 2, "SPACES": 4, "COORDINATES": [-122.42177834, 37.78346622]},
221+
{"ADDRESS": "1380 HOWARD ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.414411, 37.774458]},
222+
{"ADDRESS": "685 CHENERY ST", "RACKS": 1, "SPACES": 2, "COORDINATES": [-122.433618, 37.73435]}
223223
];
224224
deckglLayer = new DeckglLayer("arc-layer", {
225225
data: features,
@@ -248,118 +248,4 @@ describe('mapboxgl_DeckglLayer', () => {
248248
done();
249249
}, 3000)
250250
});
251-
252-
it("getGraphicBy add getGraphicById", (done) => {
253-
let graphics = [];
254-
map = new ol.Map({
255-
target: 'map',
256-
view: new ol.View({
257-
center: [0, 0],
258-
zoom: 2,
259-
projection: 'EPSG:4326'
260-
}),
261-
renderer: ['canvas']
262-
});
263-
for (let j = 0; j < coors.length; ++j) {
264-
graphics[j] = new ol.Graphic(new ol.geom.Point(coors[j]));
265-
graphics[j].setId(j);
266-
graphics[j].setAttributes({name: "graphic_" + j});
267-
}
268-
const graphicLayer = new ol.layer.Image({
269-
source: new Graphic({
270-
graphics: graphics,
271-
map: map
272-
})
273-
});
274-
map.addLayer(graphicLayer);
275-
276-
setTimeout(() => {
277-
const graphic = graphicLayer.getSource().getGraphicBy("id", 1);
278-
expect(graphic).not.toBeNull();
279-
expect(graphic.getId()).toEqual(1);
280-
281-
const graphic1 = graphicLayer.getSource().getGraphicById(1);
282-
expect(graphic1.getId()).toEqual(1);
283-
284-
map.removeLayer(graphicLayer);
285-
done();
286-
}, 4000)
287-
288-
289-
});
290-
it("getGraphicsByAttribute", (done) => {
291-
let graphics = [];
292-
map = new ol.Map({
293-
target: 'map',
294-
view: new ol.View({
295-
center: [0, 0],
296-
zoom: 2,
297-
projection: 'EPSG:4326'
298-
}),
299-
renderer: ['canvas']
300-
});
301-
for (let j = 0; j < coors.length; ++j) {
302-
graphics[j] = new ol.Graphic(new ol.geom.Point(coors[j]));
303-
graphics[j].setId(j);
304-
graphics[j].setAttributes({name: "graphic_" + j});
305-
}
306-
const graphicLayer = new ol.layer.Image({
307-
source: new Graphic({
308-
graphics: graphics,
309-
map: map
310-
})
311-
});
312-
map.addLayer(graphicLayer);
313-
314-
setTimeout(() => {
315-
const graphic = graphicLayer.getSource().getGraphicsByAttribute("name", "graphic_1");
316-
expect(graphic).not.toBeNull();
317-
expect(graphic[0].getAttributes().name).toBe("graphic_1");
318-
map.removeLayer(graphicLayer);
319-
done();
320-
}, 4000);
321-
});
322-
it("removeGraphics", () => {
323-
let graphics = [];
324-
map = new ol.Map({
325-
target: 'map',
326-
view: new ol.View({
327-
center: [0, 0],
328-
zoom: 2,
329-
projection: 'EPSG:4326'
330-
}),
331-
renderer: ['canvas']
332-
});
333-
for (let j = 0; j < coors.length; ++j) {
334-
graphics[j] = new ol.Graphic(new ol.geom.Point(coors[j]));
335-
graphics[j].setId(j);
336-
graphics[j].setAttributes({name: "graphic_" + j});
337-
}
338-
const graphicLayer = new ol.layer.Image({
339-
source: new Graphic({
340-
graphics: graphics,
341-
map: map
342-
})
343-
});
344-
map.addLayer(graphicLayer);
345-
346-
setTimeout(() => {
347-
const graphicSource = graphicLayer.getSource();
348-
//删除单个
349-
let deleteGraphic = graphic[0];
350-
expect(graphicSource.graphics.length).toEqual(5);
351-
graphicSource.removeGraphics(deleteGraphic);
352-
expect(graphicSource.graphics.length).toEqual(4);
353-
354-
//多个
355-
deleteGraphic = [graphic[1], graphic[2]];
356-
graphicSource.removeGraphics(deleteGraphic);
357-
expect(graphicSource.graphics.length).toEqual(2);
358-
359-
//默认
360-
graphicSource.removeGraphics();
361-
expect(graphicSource.graphics.length).toEqual(0);
362-
}, 4000);
363-
364-
});
365251
});

‎test/mapboxgl/overlay/MapvLayerSpec.js

Lines changed: 41 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,19 @@ var url = GlobeParameter.ChinaURL + '/zxyTileImage.png?z={z}&x={x}&y={y}';
66

77
describe('mapboxgl_MapVLayer', () => {
88
var originalTimeout;
9+
let data = [], dataSet;
910
var testDiv, map, mapvLayer;
11+
var options = {
12+
gradient: {
13+
0: 'blue',
14+
0.5: 'yellow',
15+
1: 'red'
16+
},
17+
lineWidth: 0.5,
18+
max: 30,
19+
draw: 'intensity',
20+
layerID: "mapv"
21+
};
1022
beforeAll(() => {
1123
testDiv = window.document.createElement("div");
1224
testDiv.setAttribute("id", "map");
@@ -38,49 +50,46 @@ describe('mapboxgl_MapVLayer', () => {
3850
center: [112, 37.94],
3951
zoom: 3
4052
});
41-
map.on('load', () => {
42-
var randomCount = 1000;
43-
var data = [];
44-
var citys = ["北京", "天津", "上海", "重庆", "石家庄", "太原", "呼和浩特", "哈尔滨", "长春", "沈阳", "济南", "南京", "合肥", "杭州", "南昌", "福州", "郑州", "武汉", "长沙", "广州", "南宁", "西安", "银川", "兰州", "西宁", "乌鲁木齐", "成都", "贵阳", "昆明", "拉萨", "海口"];
45-
// 构造数据
46-
while (randomCount--) {
47-
var cityCenter1 = utilCityCenter.getCenterByCityName(citys[parseInt(Math.random() * citys.length)]);
48-
var cityCenter2 = utilCityCenter.getCenterByCityName(citys[parseInt(Math.random() * citys.length)]);
49-
data.push({
50-
geometry: {
51-
type: 'LineString',
52-
coordinates: [[cityCenter1.lng - 1 + Math.random() * 1, cityCenter1.lat - 1 + Math.random() * 1],
53-
[cityCenter2.lng - 1 + Math.random() * 1, cityCenter2.lat - 1 + Math.random() * 1]
54-
]
55-
},
56-
count: 30 * Math.random()
57-
});
58-
}
59-
var dataSet = new DataSet(data);
60-
var options = {
61-
gradient: {
62-
0: 'blue',
63-
0.5: 'yellow',
64-
1: 'red'
65-
},
66-
lineWidth: 0.5,
67-
max: 30,
68-
draw: 'intensity'
69-
};
70-
mapvLayer = new MapvLayer(map, dataSet, options);
71-
});
7253

7354
});
7455
beforeEach(() => {
7556
originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
7657
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
58+
var randomCount = 1000;
59+
var citys = ["北京", "天津", "上海", "重庆", "石家庄", "太原", "呼和浩特", "哈尔滨", "长春", "沈阳", "济南", "南京", "合肥", "杭州", "南昌", "福州", "郑州", "武汉", "长沙", "广州", "南宁", "西安", "银川", "兰州", "西宁", "乌鲁木齐", "成都", "贵阳", "昆明", "拉萨", "海口"];
60+
// 构造数据
61+
while (randomCount--) {
62+
var cityCenter1 = utilCityCenter.getCenterByCityName(citys[parseInt(Math.random() * citys.length)]);
63+
var cityCenter2 = utilCityCenter.getCenterByCityName(citys[parseInt(Math.random() * citys.length)]);
64+
data.push({
65+
geometry: {
66+
type: 'LineString',
67+
coordinates: [[cityCenter1.lng - 1 + Math.random() * 1, cityCenter1.lat - 1 + Math.random() * 1],
68+
[cityCenter2.lng - 1 + Math.random() * 1, cityCenter2.lat - 1 + Math.random() * 1]
69+
]
70+
},
71+
count: 30 * Math.random()
72+
});
73+
}
74+
dataSet = new DataSet(data);
75+
76+
if (!map.getLayer("mapv")) {
77+
mapvLayer = new MapvLayer(map, dataSet, options);
78+
}
7779
});
7880
afterEach(() => {
7981
jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
82+
83+
if (map.getLayer("mapv")) {
84+
map.removeLayer("mapv");
85+
}
86+
dataSet = null;
87+
data = [];
8088
});
8189
afterAll(() => {
8290
document.body.removeChild(testDiv);
83-
map=null; });
91+
map = null;
92+
});
8493

8594
it('initialize', (done) => {
8695
setTimeout(() => {
@@ -112,8 +121,6 @@ describe('mapboxgl_MapVLayer', () => {
112121
expect(thisMapvlayer.renderer.canvasLayer.canvas.style.display).toBe('none');
113122
});
114123

115-
116-
117124
it('addData', () => {
118125
var data = [{
119126
geometry: {
@@ -180,30 +187,9 @@ describe('mapboxgl_MapVLayer', () => {
180187
expect(mapvLayer.dataSet._data.length).toEqual(0);
181188
});
182189

183-
it('draw, redraw', () => {
184-
mapvLayer.draw();
185-
expect(mapvLayer.canvas.width).toEqual(500);
186-
expect(mapvLayer.canvas.style.width).toBe('500px');
187-
mapvLayer.redraw();
188-
expect(mapvLayer.canvas.width).toEqual(500);
189-
expect(mapvLayer.canvas.style.width).toBe('500px');
190-
});
191-
192190
it('setZIndex', () => {
193191
mapvLayer.setZIndex(2);
194192
expect(mapvLayer.canvas.style.zIndex).toEqual('2');
195193
});
196194

197-
it('getCanvas', () => {
198-
var canvas = mapvLayer.getCanvas();
199-
expect(canvas).not.toBeNull();
200-
expect(mapvLayer.canvas.width).toEqual(500);
201-
expect(mapvLayer.canvas.height).toEqual(500);
202-
});
203-
204-
it('getContainer', () => {
205-
var container = mapvLayer.getContainer();
206-
expect(container).not.toBeNull();
207-
});
208-
209195
});

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy