Skip to content

Commit a0ce586

Browse files
fix ol webmap 对矢量瓦片服务凭证的判断
1 parent 640b3e3 commit a0ce586

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/openlayers/mapping/WebMap.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5206,9 +5206,6 @@ export class WebMap extends Observable {
52065206
let baseUrl = layerInfo.url;
52075207
let paramUrl = baseUrl.split('?')[1];
52085208
let spriteUrl = styles.sprite;
5209-
if (!CommonUtil.isAbsoluteURL(styles.sprite)) {
5210-
spriteUrl = CommonUtil.relative2absolute(styles.sprite, baseUrl);
5211-
}
52125209
if (layerInfo.dataSource.type === 'ARCGIS_VECTORTILE') {
52135210
Object.keys(styles.sources).forEach(function (key) {
52145211
Object.keys(styles.sources[key]).forEach(function(fieldName) {
@@ -5221,7 +5218,12 @@ export class WebMap extends Observable {
52215218
});
52225219
});
52235220
}
5224-
let withCredentials = this.isIportalProxyServiceUrl(spriteUrl);
5221+
let sourceName = Object.keys(styles.sources)[0];
5222+
let checkUrl = styles.sources[sourceName].url || styles.sources[sourceName].tiles[0];
5223+
if (checkUrl && !Util.isAbsoluteURL(checkUrl)) {
5224+
checkUrl = Util.relative2absolute(checkUrl, baseUrl);
5225+
}
5226+
let withCredentials = CommonUtil.isInTheSameDomain(checkUrl) || this.isIportalProxyServiceUrl(checkUrl);
52255227
const requestParameters = this.tileRequestParameters && this.tileRequestParameters(spriteUrl);
52265228
// 创建MapBoxStyle样式
52275229
let mapboxStyles = new MapboxStyles({

0 commit comments

Comments
 (0)