From 596aa3a11a26b462a14eea0ce924cc208ddd2de0 Mon Sep 17 00:00:00 2001 From: "kip.song" Date: Fri, 27 Oct 2023 11:33:51 +0800 Subject: [PATCH] feat: update lint --- packages/source/src/index.ts | 2 +- packages/source/src/parser/jsonTile.ts | 81 +++++++++++++------------- 2 files changed, 40 insertions(+), 43 deletions(-) diff --git a/packages/source/src/index.ts b/packages/source/src/index.ts index dd6731c599..e0660d707a 100644 --- a/packages/source/src/index.ts +++ b/packages/source/src/index.ts @@ -4,12 +4,12 @@ import geojson from './parser/geojson'; import geojsonVTTile from './parser/geojsonvt'; import image from './parser/image'; import json from './parser/json'; +import jsonTile from './parser/jsonTile'; import mapboxVectorTile from './parser/mvt'; import raster from './parser/raster'; import rasterTile, { rasterDataTypes } from './parser/raster-tile'; import rasterRgb from './parser/rasterRgb'; import testTile from './parser/testTile'; -import jsonTile from './parser/jsonTile'; import Source from './source'; import { cluster } from './transform/cluster'; import { filter } from './transform/filter'; diff --git a/packages/source/src/parser/jsonTile.ts b/packages/source/src/parser/jsonTile.ts index 236b427416..79e6acbfe9 100644 --- a/packages/source/src/parser/jsonTile.ts +++ b/packages/source/src/parser/jsonTile.ts @@ -1,13 +1,11 @@ import { + getData, + getURLFromTemplate, RequestParameters, SourceTile, TileLoadParams, - getData, - getURLFromTemplate, } from '@antv/l7-utils'; -import { - Feature, -} from '@turf/helpers'; +import { Feature } from '@turf/helpers'; import { IParserData, ITileSource } from '../interface'; import VtSource from '../source/geojsonvt'; @@ -23,39 +21,25 @@ const getVectorTile = async ( requestParameters?: Partial, getCustomData?: ITileParserCFG['getCustomData'], ): Promise => { - const tileUrl = getURLFromTemplate(url, { x: tile.x, y: tile.y, z: tile.z }); + const params = { x: tile.x, y: tile.y, z: tile.z }; + const tileUrl = getURLFromTemplate(url, params); return new Promise((resolve) => { if (getCustomData) { - getCustomData( - { - x: tile.x, - y: tile.y, - z: tile.z, - }, - (err, data) => { - if (err || !data) { - const vectorTile: MapboxVectorTile = { - layers: { - defaultLayer: { - features: [], - }, - }, - }; - const vectorSource = new VtSource(vectorTile, tile.x, tile.y, tile.z); - resolve(vectorSource); - } else { - const vectorTile: MapboxVectorTile = { - layers: { - defaultLayer: { - features: data.features, - }, - }, - }; - const vectorSource = new VtSource(vectorTile, tile.x, tile.y, tile.z); - resolve(vectorSource); - } - }, - ); + getCustomData(params, (err, data) => { + if (err || !data) { + const vectorTile: MapboxVectorTile = { + layers: { defaultLayer: { features: [] } }, + }; + const vectorSource = new VtSource(vectorTile, tile.x, tile.y, tile.z); + resolve(vectorSource); + } else { + const vectorTile: MapboxVectorTile = { + layers: { defaultLayer: { features: data.features } }, + }; + const vectorSource = new VtSource(vectorTile, tile.x, tile.y, tile.z); + resolve(vectorSource); + } + }); } else { getData( { @@ -71,18 +55,28 @@ const getVectorTile = async ( }, }, }; - const vectorSource = new VtSource(vectorTile, tile.x, tile.y, tile.z); + const vectorSource = new VtSource( + vectorTile, + tile.x, + tile.y, + tile.z, + ); resolve(vectorSource); } else { - const json = JSON.parse(data) + const json = JSON.parse(data); const vectorTile: MapboxVectorTile = { layers: { defaultLayer: { - features: json + features: json, }, }, }; - const vectorSource = new VtSource(vectorTile, tile.x, tile.y, tile.z); + const vectorSource = new VtSource( + vectorTile, + tile.x, + tile.y, + tile.z, + ); resolve(vectorSource); } }, @@ -91,8 +85,11 @@ const getVectorTile = async ( }); }; -export default function jsonTile(url: string, cfg: ITileParserCFG): IParserData { - const getTileData = (_tileParams: TileLoadParams, tile: SourceTile) => { +export default function jsonTile( + url: string, + cfg: ITileParserCFG, +): IParserData { + const getTileData = (_: TileLoadParams, tile: SourceTile) => { return getVectorTile(url, tile, cfg?.requestParameters, cfg.getCustomData); };