Skip to content

Commit 163b5f8

Browse files
author
chenguanglin
committed
【update】reRender更名为refresh,增加UT
review by qiul
1 parent 104a887 commit 163b5f8

File tree

2 files changed

+33
-4
lines changed

2 files changed

+33
-4
lines changed

src/openlayers/mapping/WebMap.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,14 @@ export class WebMap extends Observable {
107107
this.tiandituKey = options.tiandituKey;
108108
//计数叠加图层,处理过的数量(成功和失败都会计数)
109109
this.layerAdded = 0;
110+
this.layers = [];
110111
this.events = new Events(this, null, ["updateDataflowFeature"], true);
111112
this.createMap(options.mapSetting);
112113
this.createWebmap();
113114
}
114115

115116
/**
117+
* @private
116118
* @function ol.supermap.WebMap.prototype._removeBaseLayer
117119
* @description 移除底图
118120
*/
@@ -127,6 +129,7 @@ export class WebMap extends Observable {
127129
}
128130

129131
/**
132+
* @private
130133
* @function ol.supermap.WebMap.prototype._removeLayers
131134
* @description 移除叠加图层
132135
*/
@@ -155,10 +158,11 @@ export class WebMap extends Observable {
155158
}
156159

157160
/**
161+
* @private
158162
* @function ol.supermap.WebMap.prototype.clear
159163
* @description 清空地图
160164
*/
161-
clear() {
165+
_clear() {
162166
// 比例尺
163167
this.scales = [];
164168
// 分辨率
@@ -173,11 +177,12 @@ export class WebMap extends Observable {
173177
}
174178

175179
/**
176-
* @function ol.supermap.WebMap.prototype.reRender
180+
* @function ol.supermap.WebMap.prototype.refresh
181+
* @version 10.1.0
177182
* @description 重新渲染地图
178183
*/
179-
reRender() {
180-
this.clear();
184+
refresh() {
185+
this._clear();
181186
this.createWebmap();
182187
}
183188

test/openlayers/mapping/WebMapSpec.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -981,4 +981,28 @@ describe('openlayers_WebMap', () => {
981981
}, 1000)
982982
});
983983

984+
it('refresh', (done) => {
985+
let refresh = false;
986+
spyOn(FetchRequest, 'get').and.callFake((url) => {
987+
if (url.indexOf('map.json') > -1) {
988+
var mapJson = refresh ? datavizWebMap_BAIDU : datavizWebMap_TIANDITU_VEC;
989+
return Promise.resolve(new Response(mapJson));
990+
}
991+
return Promise.resolve();
992+
});
993+
var datavizWebmap = new WebMap(id, {
994+
server: server
995+
});
996+
997+
setTimeout(() => {
998+
expect(datavizWebmap.baseLayer.name).toEqual('天地图');
999+
refresh = true;
1000+
datavizWebmap.refresh();
1001+
setTimeout(() => {
1002+
expect(datavizWebmap.baseLayer.name).toEqual('百度地图');
1003+
done();
1004+
}, 1000);
1005+
}, 1000)
1006+
})
1007+
9841008
});

0 commit comments

Comments
 (0)