Skip to content

Commit 43defd5

Browse files
fix ol webmap 对矢量瓦片服务凭证的判断
1 parent 8198a08 commit 43defd5

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/openlayers/mapping/WebMap.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -4820,10 +4820,6 @@ export class WebMap extends Observable {
48204820
// const origin = [envelope.left, envelope.top];
48214821
let baseUrl = layerInfo.url;
48224822
let paramUrl = baseUrl.split('?')[1];
4823-
let spriteUrl = styles.sprite;
4824-
if (!CommonUtil.isAbsoluteURL(styles.sprite)) {
4825-
spriteUrl = CommonUtil.relative2absolute(styles.sprite, baseUrl);
4826-
}
48274823
if (layerInfo.dataSource.type === 'ARCGIS_VECTORTILE') {
48284824
Object.keys(styles.sources).forEach(function (key) {
48294825
Object.keys(styles.sources[key]).forEach(function(fieldName) {
@@ -4836,7 +4832,12 @@ export class WebMap extends Observable {
48364832
});
48374833
});
48384834
}
4839-
let withCredentials = this.isIportalProxyServiceUrl(spriteUrl);
4835+
let sourceName = Object.keys(styles.sources)[0];
4836+
let checkUrl = styles.sources[sourceName].url || styles.sources[sourceName].tiles[0];
4837+
if (checkUrl && !CommonUtil.isAbsoluteURL(checkUrl)) {
4838+
checkUrl = CommonUtil.relative2absolute(checkUrl, baseUrl);
4839+
}
4840+
let withCredentials = CommonUtil.isInTheSameDomain(checkUrl) || this.isIportalProxyServiceUrl(checkUrl);
48404841
// 创建MapBoxStyle样式
48414842
let mapboxStyles = new MapboxStyles({
48424843
baseUrl,

0 commit comments

Comments
 (0)