8000 【fix】setWebMapOptions 优化; review by songym · SuperMap/iClient-JavaScript@df55cdf · GitHub
[go: up one dir, main page]
Skip to content

Commit df55cdf

Browse files
xiongjiaojiaoxiongjiaojiao
committed
【fix】setWebMapOptions 优化; review by songym
1 parent 0cf266b commit df55cdf

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

‎src/common/mapping/WebMapBase.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ export function createWebMapBaseExtending(SuperClass, { mapRepo }) {
350350
*/
351351
setWebMapOptions(webMapOptions) {
352352
this.setServerUrl(webMapOptions.server);
353-
this._createWebMap();
353+
this._initWebMap();
354354
}
355355

356356
/**

‎test/mapboxgl/mapping/WebMapSpec.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ describe('mapboxgl_WebMap', () => {
135135
done();
136136
});
137137
});
138+
138139
it('setWebMapOptions', (done) => {
139140
let options = {
140141
server: server
@@ -151,13 +152,18 @@ describe('mapboxgl_WebMap', () => {
151152
});
152153
datavizWebmap = new WebMap(id, options);
153154
datavizWebmap.once('mapcreatesucceeded', () => {
154-
const nextUrl = 'http://www.test.com';
155-
datavizWebmap.setServerUrl('http://www.test.com');
156-
expect(datavizWebmap.options.server).toBe(`${nextUrl}/`);
155+
expect(datavizWebmap.options.server).toBe(server);
157156
expect(datavizWebmap.options.serverUrl).toBe(datavizWebmap.options.server);
158-
done();
157+
const nextUrl = 'http://www.test.com';
158+
datavizWebmap.setWebMapOptions({ server: nextUrl });
159+
datavizWebmap.on('mapcreatesucceeded', () => {
160+
expect(datavizWebmap.options.server).toBe(`${nextUrl}/`);
161+
expect(datavizWebmap.options.serverUrl).toBe(datavizWebmap.options.server);
162+
done();
163+
});
159164
});
160165
});
166+
161167
it('setMapOptions', (done) => {
162168
spyOn(FetchRequest, 'get').and.callFake((url) => {
163169
if (url.indexOf('web/config/portal.json') > -1) {

‎test/maplibregl/mapping/WebMapSpec.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ describe('maplibregl_WebMap', () => {
135135
done();
136136
});
137137
});
138+
138139
it('setWebMapOptions', (done) => {
139140
let options = {
140141
server: server
@@ -151,13 +152,18 @@ describe('maplibregl_WebMap', () => {
151152
});
152153
datavizWebmap = new WebMap(id, options);
153154
datavizWebmap.once('mapcreatesucceeded', () => {
154-
const nextUrl = 'http://www.test.com';
155-
datavizWebmap.setServerUrl('http://www.test.com');
156-
expect(datavizWebmap.options.server).toBe(`${nextUrl}/`);
155+
expect(datavizWebmap.options.server).toBe(server);
157156
expect(datavizWebmap.options.serverUrl).toBe(datavizWebmap.options.server);
158-
done();
157+
const nextUrl = 'http://www.test.com';
158+
datavizWebmap.setWebMapOptions({ server: nextUrl });
159+
datavizWebmap.on('mapcreatesucceeded', () => {
160+
expect(datavizWebmap.options.server).toBe(`${nextUrl}/`);
161+
expect(datavizWebmap.options.serverUrl).toBe(datavizWebmap.options.server);
162+
done();
163+
});
159164
});
160165
});
166+
161167
it('setMapOptions', (done) => {
162168
spyOn(FetchRequest, 'get').and.callFake((url) => {
163169
if (url.indexOf('web/config/portal.json') > -1) {

0 commit comments

Comments
 (0)
0