Skip to content

Commit 6c38e3c

Browse files
lviseiDreammy23谨欣github-actions[bot]
authored
fix: 修复 arraybuffer 类型数据自定义请求头参数透传逻辑 (#2412)
* chore: changeset * fix: 修复 arraybuffer 类型数据自定义请求头参数透传逻辑 (#2403) * fix: 修复 arraybuffer 类型数据自定义请求头参数透传逻辑 * chore: changeset log * fix: 修复 arraybuffer 类型数据自定义请求头参数透传逻辑 * chore: format file --------- Co-authored-by: 谨欣 <echo.cmy@antgroup.com> * chore: version (beat) (#2404) * chore: exit pre --------- Co-authored-by: Dreammy23 <caomengyuan2015@163.com> Co-authored-by: 谨欣 <echo.cmy@antgroup.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent ccc3440 commit 6c38e3c

File tree

4 files changed

+35
-9
lines changed

4 files changed

+35
-9
lines changed

.changeset/pre.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"mode": "exit",
3+
"tag": "beat",
4+
"initialVersions": {
5+
"@antv/l7-component": "2.21.4",
6+
"@antv/l7-core": "2.21.4",
7+
"@antv/l7": "2.21.4",
8+
"@antv/l7-layers": "2.21.4",
9+
"@antv/l7-map": "2.21.4",
10+
"@antv/l7-maps": "2.21.4",
11+
"@antv/l7-renderer": "2.21.4",
12+
"@antv/l7-scene": "2.21.4",
13+
"@antv/l7-source": "2.21.4",
14+
"@antv/l7-test-utils": "2.21.4",
15+
"@antv/l7-three": "2.21.4",
16+
"@antv/l7-utils": "2.21.4",
17+
"@antv/l7-site": "2.21.3"
18+
},
19+
"changesets": ["tame-trees-fold"]
20+
}

.changeset/tame-trees-fold.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@antv/l7-source': patch
3+
---
4+
5+
fix: 修复 arraybuffer 类型数据自定义请求头参数透传逻辑

packages/source/src/parser/raster-tile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default function rasterTile(
5555
cfg?.getCustomData,
5656
);
5757
case RasterTileType.ARRAYBUFFER:
58-
return getTileBuffer(data, tileParams, tile, cfg?.format || defaultFormat, cfg?.operation);
58+
return getTileBuffer(data, tileParams, tile, cfg);
5959
case RasterTileType.CUSTOMARRAYBUFFER:
6060
case RasterTileType.CUSTOMRGB:
6161
return getCustomData(

packages/source/src/utils/tile/getRasterTile.ts

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type { ITileParserCFG } from '@antv/l7-core';
22
import type { ITileBand, SourceTile, TileLoadParams } from '@antv/l7-utils';
33
import { getImage, getURLFromTemplate, getWMTSURLFromTemplate } from '@antv/l7-utils';
4-
import type { IBandsOperation, IRasterFormat } from '../../interface';
54
import { getRasterFile } from './getRasterData';
65
import { getTileUrl } from './request';
76

@@ -18,29 +17,31 @@ export const getTileBuffer = async (
1817
url: string | string[] | ITileBand[],
1918
tileParams: TileLoadParams,
2019
tile: SourceTile,
21-
rasterFormat: IRasterFormat,
22-
operation?: IBandsOperation,
20+
cfg: Partial<ITileParserCFG>,
2321
): Promise<HTMLImageElement | ImageBitmap> => {
24-
const requestParameters = {
25-
// getTileUrl 将原始的 url 路径进行转化(多服务器)
26-
url: getTileUrl(url, tileParams),
22+
const { format = defaultFormat, operation, requestParameters = {} } = cfg;
23+
const reqParams = {
24+
...requestParameters,
25+
url: getTileUrl(url, tileParams), // getTileUrl 将原始的 url 路径进行转化(多服务器)
2726
};
27+
2828
return new Promise((resolve, reject) => {
2929
getRasterFile(
3030
tile,
31-
requestParameters,
31+
reqParams,
3232
(err: any, img: any) => {
3333
if (err) {
3434
reject(err);
3535
} else if (img) {
3636
resolve(img);
3737
}
3838
},
39-
rasterFormat,
39+
format,
4040
operation,
4141
);
4242
});
4343
};
44+
4445
/**
4546
* 获取图片格式的文件 jpg、png 等
4647
* @param url

0 commit comments

Comments
 (0)