Skip to content

Commit 81b7bdb

Browse files
xilanhuaweidapaoxilanhuaweidapao
committed
【update】ol webmap 支持 arcgis vectortile 并style 请求带上 baseUrl 参数 review by luox
1 parent b089acb commit 81b7bdb

5 files changed

Lines changed: 116 additions & 4 deletions

File tree

‎src/common/mapping/WebMapV2.js‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,19 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
363363
style.layers.forEach(layer => {
364364
layer.layout && (layer.layout.visibility = this._getVisibility(layerInfo.visible));
365365
});
366+
if (layerInfo.dataSource.type === 'ARCGIS_VECTORTILE') {
367+
let paramUrl = url.split('?')[1];
368+
Object.keys(style.sources).forEach((key) => {
369+
Object.keys(style.sources[key]).forEach((fieldName) => {
370+
if (fieldName === 'url') {
371+
if (typeof style.sources[key][fieldName] === 'string' && !this.isAbsoluteURL(style.sources[key][fieldName])) {
372+
style.sources[key][fieldName] = this.relative2absolute(style.sources[key][fieldName], url);
373+
}
374+
style.sources[key][fieldName] = style.sources[key][fieldName] + (paramUrl ? '?' + paramUrl + '&f=json' : '?f=json');
375+
}
376+
});
377+
});
378+
}
366379
this.map.addStyle(style, undefined, undefined, undefined, url);
367380
const layerIds = [];
368381
style.layers.forEach((item) => {
@@ -3068,5 +3081,22 @@ export function createWebMapV2Extending(SuperClass, { MapManager, mapRepo, DataF
30683081
const visibility = visible === true || visible === 'visible' ? 'visible' : 'none';
30693082
return visibility;
30703083
}
3084+
3085+
isAbsoluteURL(url) {
3086+
try {
3087+
const res = new URL(url);
3088+
return !!res;
3089+
} catch (_) {
3090+
return false;
3091+
}
3092+
}
3093+
3094+
relative2absolute(url, base) {
3095+
let newUrl = new URL(url, base);
3096+
if (newUrl && newUrl.href) {
3097+
return decodeURIComponent(newUrl.href);
3098+
}
3099+
return null;
3100+
}
30713101
};
30723102
}

‎src/openlayers/mapping/WebMap.js‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5126,11 +5126,24 @@ export class WebMap extends Observable {
51265126
const envelope = this.getEnvelope(indexbounds, layerInfo.bounds);
51275127
const styleResolutions = this.getStyleResolutions(envelope);
51285128
// const origin = [envelope.left, envelope.top];
5129-
let baseUrl = layerInfo.url && layerInfo.url.split('?')[0];
5129+
let baseUrl = layerInfo.url;
5130+
let paramUrl = baseUrl.split('?')[1];
51305131
let spriteUrl = styles.sprite;
51315132
if (!CommonUtil.isAbsoluteURL(styles.sprite)) {
51325133
spriteUrl = CommonUtil.relative2absolute(styles.sprite, baseUrl);
51335134
}
5135+
if (layerInfo.dataSource.type === 'ARCGIS_VECTORTILE') {
5136+
Object.keys(styles.sources).forEach(function (key) {
5137+
Object.keys(styles.sources[key]).forEach(function(fieldName) {
5138+
if (fieldName === 'url') {
5139+
if (typeof styles.sources[key][fieldName] === 'string' && !CommonUtil.isAbsoluteURL(styles.sources[key][fieldName])) {
5140+
styles.sources[key][fieldName] = CommonUtil.relative2absolute(styles.sources[key][fieldName], baseUrl);
5141+
}
5142+
styles.sources[key][fieldName] = styles.sources[key][fieldName] + (paramUrl ? '?' + paramUrl + '&f=json' : '?f=json');
5143+
}
5144+
});
5145+
});
5146+
}
51345147
let withCredentials = this.isIportalProxyServiceUrl(spriteUrl);
51355148
const requestParameters = this.tileRequestParameters && this.tileRequestParameters(spriteUrl);
51365149
// 创建MapBoxStyle样式

‎src/openlayers/overlay/VectorTileSuperMapRest.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,15 @@ export class VectorTileSuperMapRest extends VectorTile {
338338
//ToDo 支持多个tiles地址
339339
if (style.sources && style.sources[source]) {
340340
let newUrl;
341+
let paramUrl = this.baseUrl && this.baseUrl.split('?')[1];
341342
if (style.sources[source].tiles) {
342343
newUrl = style.sources[source].tiles[0];
343344
if (!CommonUtil.isAbsoluteURL(newUrl)) {
344345
newUrl = CommonUtil.relative2absolute(newUrl, this.baseUrl);
345346
}
347+
if (paramUrl) {
348+
newUrl = CommonUtil.urlAppend(newUrl, paramUrl);
349+
}
346350
} else if (style.sources[source].url) {
347351
let tiles = style.sources[source].url;
348352
if (!CommonUtil.isAbsoluteURL(tiles)) {
@@ -355,6 +359,9 @@ export class VectorTileSuperMapRest extends VectorTile {
355359
tileUrl = CommonUtil.relative2absolute(tileUrl, tiles);
356360
}
357361
newUrl = SecurityManager.appendCredential(tileUrl);
362+
if (paramUrl) {
363+
newUrl = CommonUtil.urlAppend(newUrl, paramUrl);
364+
}
358365
}
359366
this._tileUrl = SecurityManager.appendCredential(newUrl);
360367
}

‎src/openlayers/overlay/vectortile/MapboxStyles.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,26 +397,34 @@ export class MapboxStyles extends Observable {
397397
return parts ? parts[1] + extension + (parts.length > 2 ? parts[2] : '') : url + extension;
398398
}
399399

400-
_handleRelativeUrl(styles, baseUrl) {
401-
if (!baseUrl) {
400+
_handleRelativeUrl(styles, url) {
401+
if (!url) {
402402
return styles;
403403
}
404+
const baseUrl = url.split('?')[0];
405+
const paramUrl = url.split('?')[1] || '';
404406
Object.keys(styles).forEach((fieldName) => {
405407
if (fieldName === 'sources') {
406408
Object.keys(styles[fieldName]).forEach((sourceName) => {
407-
this._handleRelativeUrl(styles[fieldName][sourceName], baseUrl);
409+
this._handleRelativeUrl(styles[fieldName][sourceName], url);
408410
})
409411
}
410412
if (fieldName === 'sprite' || fieldName === 'glyphs' || fieldName === 'url') {
411413
if (typeof styles[fieldName] === 'string' && !CommonUtil.isAbsoluteURL(styles[fieldName])) {
412414
styles[fieldName] = CommonUtil.relative2absolute(styles[fieldName], baseUrl);
413415
}
416+
if (paramUrl && !styles[fieldName].includes(paramUrl)) {
417+
styles[fieldName] = styles[fieldName] + (paramUrl ? (styles[fieldName].includes('?') ? '&' + paramUrl : '?' + paramUrl) : '');
418+
}
414419
}
415420
if (fieldName === 'tiles' && Array.isArray(styles[fieldName])) {
416421
styles[fieldName].forEach((tile) => {
417422
if (!CommonUtil.isAbsoluteURL(tile)) {
418423
tile = CommonUtil.relative2absolute(tile, baseUrl);
419424
}
425+
if (paramUrl && !tile.includes(paramUrl)) {
426+
tile = tile + (paramUrl ? (styles[fieldName].includes('?') ? '&' + paramUrl : '?' + paramUrl) : '');
427+
}
420428
})
421429
}
422430
})

‎test/openlayers/overlay/vectortile/MapboxStylesSpec.js‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,4 +334,58 @@ describe("openlayers_MapboxStyles", () => {
334334
}
335335
});
336336
});
337+
338+
it("handle relative url with param", done => {
339+
spyOn(XMLHttpRequest.prototype, 'send').and.callThrough();
340+
spyOn(XMLHttpRequest.prototype, 'setRequestHeader').and.callThrough();
341+
var style = {
342+
"version" : 8,
343+
"sprite" : "../sprites/sprite",
344+
"glyphs" : "../fonts/{fontstack}/{range}.pbf",
345+
"sources": {
346+
"esri": {
347+
"type": "vector",
348+
"url": "../../"
349+
}
350+
},
351+
"layers" : [{
352+
"id" : "Contour_11_main/0",
353+
"type" : "line",
354+
"source" : "esri",
355+
"source-layer" : "Contour",
356+
"filter" : ["all", ["==", "Index3", 1], ["==", "Index5", 1]],
357+
"minzoom" : 11,
358+
"maxzoom" : 12,
359+
"paint" : {
360+
"line-color" : "#61674a",
361+
"line-opacity" : 0.5,
362+
"line-width" : {
363+
"base" : 1.2,
364+
"stops" : [[11, 0.7], [16, 1.1]]
365+
}
366+
}
367+
}]
368+
}
369+
mapboxStyles = new MapboxStyles({
370+
style: style,
371+
baseUrl: 'http://localhost:9876?tkk=ddddssss',
372+
map: map,
373+
source: "California",
374+
headers:{'appToken':'test'}
375+
});
376+
mapboxStyles.on("styleloaded", () => {
377+
try {
378+
style = mapboxStyles.getStyleFunction();
379+
expect(style).not.toBeNull();
380+
expect(mapboxStyles._mbStyle.glyphs).toBe('http://localhost:9876/fonts/{fontstack}/{range}.pbf?tkk=ddddssss');
381+
expect(mapboxStyles._mbStyle.sprite).toBe('http://localhost:9876/sprites/sprite?tkk=ddddssss');
382+
expect(mapboxStyles._mbStyle.sources['esri']['url']).toBe('http://localhost:9876/?tkk=ddddssss');
383+
done();
384+
} catch (e) {
385+
console.log("'init_Style_headers'案例失败" + e.name + ":" + e.message);
386+
expect(false).toBeTruthy();
387+
done();
388+
}
389+
});
390+
});
337391
});

0 commit comments

Comments
 (0)