Skip to content

Commit 160e53d

Browse files
committed
[fix]修复ol webmap添加没有serverId的图层时,阻断了后面layer的添加的问题 review by luox
1 parent a828bb0 commit 160e53d

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

src/openlayers/mapping/WebMap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1983,7 +1983,7 @@ export class WebMap extends Observable {
19831983
await that.addLayer(layer, null, layerIndex);
19841984
that.layerAdded++;
19851985
that.sendMapToUser(len);
1986-
return;
1986+
continue;
19871987
}
19881988
if (
19891989
layer.layerType === 'MARKER' ||

test/openlayers/mapping/WebMapSpec.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1940,5 +1940,25 @@ describe('openlayers_WebMap', () => {
19401940
}, 500);
19411941
}
19421942
});
1943+
it('datavizWebMap_noServerIdMarker', (done) => {
1944+
let options = {
1945+
server: server,
1946+
webMap: defaultServeRequest,
1947+
successCallback,
1948+
errorCallback: function () { }
1949+
};
1950+
spyOn(FetchRequest, 'get').and.callFake((url) => {
1951+
if (url.indexOf('map.json') > -1) {
1952+
var mapJson = datavizWebMap_noServerIdMarker;
1953+
return Promise.resolve(new Response(mapJson));
1954+
}
1955+
return Promise.resolve();
1956+
});
1957+
var datavizWebmap = new WebMap(options);
1958+
function successCallback() {
1959+
expect(datavizWebmap.server).toBe(server);
1960+
done();
1961+
}
1962+
});
19431963

19441964
});

test/resources/WebMapV5.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)