p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Chore: 修复部分lint 警告，pre-commit 移除build命令 (#1285) 

* chore: lint unuse

* chore: pre commit command

* chore: pre-commit 去除build 命令
This commit is contained in:
@thinkinggis 2022-08-11 14:04:56 +08:00 committed by GitHub
parent 089d172324
commit 101fe3744f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 108 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -18,3 +18,4 @@ gatsby-*.js
global.d.ts
jest.config.js
.eslintrc.*
packages/utils/src/mini-adapter/

5
.eslintrc.js
View File

@ -15,8 +15,9 @@ module.exports = {
ecmaVersion: 12,
sourceType: 'module'
},
plugins: ['@typescript-eslint'],
plugins: ['@typescript-eslint',"unused-imports"],
rules: {
"unused-imports/no-unused-imports": "error",
'@typescript-eslint/no-loss-of-precision':0,
'@typescript-eslint/no-inferrable-types': 0,
'no-constant-condition': 0,
@ -38,5 +39,5 @@ module.exports = {
alwaysTryTypes: true,
},
},
},
}
};

2
dev-demos/features/point/image.tsx
View File

@ -1,4 +1,4 @@
import { PointLayer, ImageLayer, Scene } from '@antv/l7';
import { ImageLayer, Scene } from '@antv/l7';
import { GaodeMap } from '@antv/l7-maps';
import React, { useEffect } from 'react';

146
dev-demos/features/point/linearline.tsx
View File

@ -1,80 +1,80 @@
import { PointLayer, LineLayer, Scene, RasterLayer } from '@antv/l7';
import { LineLayer, Scene } from '@antv/l7';
import { GaodeMap } from '@antv/l7-maps';
import React, { useEffect } from 'react';
export default () => {
useEffect(() => {
const scene = new Scene({
id: 'map',
map: new GaodeMap({
center: [105, 30.258134],
zoom: 5,
}),
});
useEffect(() => {
const scene = new Scene({
id: 'map',
map: new GaodeMap({
center: [105, 30.258134],
zoom: 5,
}),
});
const geoData = {
type: 'FeatureCollection',
features: [
{
type: 'Feature',
properties: {
testOpacity: 0.8,
},
geometry: {
type: 'Polygon',
coordinates: [
[
[99.228515625, 37.43997405227057],
[99.228515625, 35.02999636902566],
[101.337890625, 32.99023555965106],
[99.052734375, 30.29701788337205],
[100.72265625, 27.994401411046148],
[99.49218749999999, 26.352497858154024],
[100.634765625, 23.725011735951796],
],
[
[108.544921875, 37.71859032558816],
[110.74218749999999, 34.66935854524543],
[110.21484375, 32.76880048488168],
[112.412109375, 32.84267363195431],
[112.1484375, 30.751277776257812],
[114.08203125, 31.42866311735861],
],
],
},
},
],
};
const layer = new LineLayer({})
.source(geoData)
.size(10)
.shape('linearline')
.style({
rampColors: {
colors: [
'#FF4818',
'#F7B74A',
'#FFF598',
'#91EABC',
'#2EA9A1',
'#206C7C',
const geoData = {
type: 'FeatureCollection',
features: [
{
type: 'Feature',
properties: {
testOpacity: 0.8,
},
geometry: {
type: 'Polygon',
coordinates: [
[
[99.228515625, 37.43997405227057],
[99.228515625, 35.02999636902566],
[101.337890625, 32.99023555965106],
[99.052734375, 30.29701788337205],
[100.72265625, 27.994401411046148],
[99.49218749999999, 26.352497858154024],
[100.634765625, 23.725011735951796],
],
weights: [0.1, 0.1, 0.1, 0.1, 0.1, 0.5]
},
});
[
[108.544921875, 37.71859032558816],
[110.74218749999999, 34.66935854524543],
[110.21484375, 32.76880048488168],
[112.412109375, 32.84267363195431],
[112.1484375, 30.751277776257812],
[114.08203125, 31.42866311735861],
],
],
},
},
],
};
scene.on('loaded', () => {
scene.addLayer(layer);
})
}, [])
return (
<div
id="map"
style={{
height:'500px',
position: 'relative'
}}
/>
);
}
const layer = new LineLayer({})
.source(geoData)
.size(10)
.shape('linearline')
.style({
rampColors: {
colors: [
'#FF4818',
'#F7B74A',
'#FFF598',
'#91EABC',
'#2EA9A1',
'#206C7C',
],
weights: [0.1, 0.1, 0.1, 0.1, 0.1, 0.5],
},
});
scene.on('loaded', () => {
scene.addLayer(layer);
});
}, []);
return (
<div
id="map"
style={{
height: '500px',
position: 'relative',
}}
/>
);
};

2
dev-demos/features/point/tile.tsx
View File

@ -1,4 +1,4 @@
import { PointLayer, ImageLayer, Scene, RasterLayer } from '@antv/l7';
import { Scene, RasterLayer } from '@antv/l7';
import { GaodeMap } from '@antv/l7-maps';
import React, { useEffect } from 'react';

6
package.json
View File

@ -83,9 +83,8 @@
"enzyme-adapter-react-16": "^1.5.0",
"enzyme-to-json": "^3.0.0-beta6",
"eslint": "^7.32.0",
"eslint-config-egg": "^7.5.1",
"eslint-plugin-html": "^6.0.0",
"eslint-plugin-no-autofix": "^1.2.3",
"eslint-plugin-unused-imports": "^2.0.0",
"father": "^4.0.0-rc.2",
"gatsby": "2.32.13",
"gatsby-plugin-google-analytics": "^2.1.27",
@ -166,6 +165,7 @@
"postbuild": "yarn build:declarations",
"build:declarations": "lerna run tsc --stream --no-bail",
"lint:fix": "prettier --write packages/**/src/**/*.ts packages/site/docs/api/**/*.md packages/site/docs/api/*.md dev-demos/**/**/*.tsx *.md",
"lint:src": "eslint packages/**/src/**/*.ts dev-demos/**/**/*.tsx ",
"lint:examples": "eslint packages/site/examples --fix --ext .js",
"lint:css": "stylelint 'packages/**/src/**/*.js{,x}'",
"lint": "run-p -c lint:*",
@ -197,7 +197,7 @@
],
"husky": {
"hooks": {
"pre-commit": "yarn run build && yarn run test-cover",
"pre-commit": "yarn run prebuild && yarn run test-cover",
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
},

1
packages/component/src/control/logo.ts
View File

@ -1,4 +1,3 @@
import { IControlOption } from '@antv/l7-core';
import { DOM } from '@antv/l7-utils';
import Control, { PositionType } from './BaseControl';

2
packages/core/src/utils/math.ts
View File

@ -1,4 +1,4 @@
import { mat3, mat4, vec3, vec4 } from 'gl-matrix';
import { vec3, vec4 } from 'gl-matrix';
export function getAngle(angle: number | undefined) {
if (angle === undefined) {

6
packages/layers/src/core/BaseLayer.ts
View File

@ -2,7 +2,6 @@
import { SyncBailHook, SyncHook, SyncWaterfallHook } from '@antv/async-hook';
import {
BlendType,
gl,
IActiveOption,
IAnimateOption,
IAttrubuteAndElements,
@ -33,17 +32,12 @@ import {
IScale,
IScaleOptions,
IShaderModuleService,
ISource,
ISourceCFG,
IStyleAttributeInitializationOptions,
IStyleAttributeService,
IStyleAttributeUpdateOptions,
LayerEventType,
lazyInject,
LegendItems,
ScaleAttributeType,
ScaleTypeName,
ScaleTypes,
StyleAttributeField,
StyleAttributeOption,
Triangulation,

2
packages/layers/src/core/BaseModel.ts
View File

@ -29,7 +29,7 @@ import {
} from '@antv/l7-core';
import { rgb2arr } from '@antv/l7-utils';
import { color } from 'd3-color';
import { isEqual, isFunction, isNumber, isString } from 'lodash';
import { isEqual, isNumber, isString } from 'lodash';
import { BlendTypes } from '../utils/blend';
export type styleSingle =

2
packages/layers/src/core/interface.ts
View File

@ -1,6 +1,6 @@
import { IAnimateOption, IMapService } from '@antv/l7-core';
import { IColorRamp, IImagedata } from '@antv/l7-utils';
import { styleOffset, styleSingle } from '../core/BaseModel';
import { styleOffset } from '../core/BaseModel';
import { anchorType } from '../utils/symbol-layout';
export enum lineStyleType {
'solid' = 0.0,

4
packages/layers/src/core/triangulation.ts
View File

@ -1,13 +1,12 @@
import { IEncodeFeature } from '@antv/l7-core';
import {
aProjectFlat,
calculateCentroid,
calculatePointsCenterAndRadius,
lngLatToMeters,
} from '@antv/l7-utils';
import earcut from 'earcut';
// @ts-ignore
import { mat4, vec3 } from 'gl-matrix';
import { vec3 } from 'gl-matrix';
import {
EARTH_RADIUS,
EARTH_RADIUS_OUTER,
@ -16,7 +15,6 @@ import {
primitiveSphere,
} from '../earth/utils';
import ExtrudePolyline from '../utils/extrude_polyline';
import SimpleLine from '../utils/simpleLine';
import extrudePolygon, {
extrude_PolygonNormal,
fillPolygon,

1
packages/layers/src/heatmap/triangulation.ts
View File

@ -1,4 +1,3 @@
import { IEncodeFeature, IParseDataItem } from '@antv/l7-core';
// @ts-ignore
export function heatMap3DTriangulation(width: number, height: number) {

3
packages/layers/src/plugins/DataMappingPlugin.ts
View File

@ -4,7 +4,6 @@ import {
IGlobalConfigService,
ILayer,
ILayerPlugin,
ILngLat,
IMapService,
IParseDataItem,
IStyleAttribute,
@ -13,7 +12,7 @@ import {
TYPES,
} from '@antv/l7-core';
import { Version } from '@antv/l7-maps';
import { isColor, normalize, rgb2arr, unProjectFlat } from '@antv/l7-utils';
import { isColor, normalize, rgb2arr } from '@antv/l7-utils';
import { inject, injectable } from 'inversify';
import { cloneDeep } from 'lodash';
import 'reflect-metadata';

8
packages/layers/src/plugins/DataSourcePlugin.ts
View File

@ -1,10 +1,4 @@
import {
ILayer,
ILayerPlugin,
ILngLat,
IMapService,
TYPES,
} from '@antv/l7-core';
import { ILayer, ILayerPlugin, IMapService, TYPES } from '@antv/l7-core';
import Source, {
DEFAULT_DATA,
DEFAULT_PARSER,

2
packages/layers/src/plugins/FeatureScalePlugin.ts
View File

@ -13,7 +13,7 @@ import {
TYPES,
} from '@antv/l7-core';
import { IParseDataItem } from '@antv/l7-source';
import { extent, ticks } from 'd3-array';
import { extent } from 'd3-array';
import * as d3interpolate from 'd3-interpolate';
import * as d3 from 'd3-scale';
import { inject, injectable } from 'inversify';

2
packages/layers/src/plugins/LayerModelPlugin.ts
View File

@ -1,4 +1,4 @@
import { ILayer, ILayerPlugin, IMapService, TYPES } from '@antv/l7-core';
import { ILayer, ILayerPlugin } from '@antv/l7-core';
import { injectable } from 'inversify';
import 'reflect-metadata';
/**

2
packages/layers/src/plugins/LayerStylePlugin.ts
View File

@ -1,4 +1,4 @@
import { ILayer, ILayerPlugin, IMapService, TYPES } from '@antv/l7-core';
import { ILayer, ILayerPlugin } from '@antv/l7-core';
import { injectable } from 'inversify';
import 'reflect-metadata';
/**

14
packages/layers/src/raster/raster.ts
View File

@ -1,16 +1,4 @@
import {
AttributeType,
gl,
IEncodeFeature,
ILayer,
ILayerPlugin,
IModelUniform,
IRasterParserDataItem,
IStyleAttributeService,
ITexture2D,
lazyInject,
TYPES,
} from '@antv/l7-core';
import { gl, IModelUniform, ITexture2D } from '@antv/l7-core';
import { generateColorRamp, IColorRamp } from '@antv/l7-utils';
import BaseLayer from '../core/BaseLayer';

2
packages/layers/src/tile/tmsTileLayer.ts
View File

@ -1,4 +1,4 @@
import { Tile, TilesetManager } from '@antv/l7-utils';
import { Tile } from '@antv/l7-utils';
import BaseTileLayer from './tileLayer/baseTileLayer';
export class TMSTileLayer extends BaseTileLayer {

2
packages/layers/src/utils/blend.ts
View File

@ -1,4 +1,4 @@
import { BlendType, gl, IBlendOptions, IBlendTypes } from '@antv/l7-core';
import { BlendType, gl, IBlendTypes } from '@antv/l7-core';
export const BlendTypes: IBlendTypes = {
[BlendType.additive]: {
enable: true,

3
packages/layers/src/utils/dataMappingStyle.ts
View File

@ -1,12 +1,9 @@
import {
gl,
ILayer,
IStyleAttributeUpdateOptions,
ITexture2D,
StyleAttributeField,
StyleAttributeOption,
} from '@antv/l7-core';
import { rgb2arr } from '@antv/l7-utils';
import { isFunction, isNumber, isString } from 'lodash';
/**
* 该文件中的工具方法主要用于对 style 中的属性进行 数据映射

10
packages/layers/src/utils/multiPassRender.ts
View File

@ -1,12 +1,4 @@
import {
IGlobalConfigService,
ILayer,
ILayerPlugin,
IPass,
IPostProcessingPass,
IRendererService,
TYPES,
} from '@antv/l7-core';
import { ILayer, IPass, IPostProcessingPass } from '@antv/l7-core';
/**
* 'blurH' -> ['blurH', {}]

2
packages/layers/src/utils/polylineNormal.ts
View File

@ -1,4 +1,4 @@
import { aProjectFlat, lngLatToMeters } from '@antv/l7-utils';
import { aProjectFlat } from '@antv/l7-utils';
import { vec2 } from 'gl-matrix';
export function computeMiter(
tangent: vec2,

2
packages/layers/src/utils/symbol-layout.ts
View File

@ -1,5 +1,3 @@
import { type } from 'os';
interface IPoint {
x: number;
y: number;

1
packages/map/src/geo/lng_lat.ts
View File

@ -1,5 +1,4 @@
import { wrap } from '../util';
import LngLatBounds from './lng_lat_bounds';
export const earthRadius = 6371008.8;
export type LngLatLike =
| LngLat

6
packages/map/src/geo/transform.ts
View File

@ -1,10 +1,8 @@
// @ts-ignore
import { isMini } from '@antv/l7-utils';
import { mat2, mat4, vec3, vec4 } from 'gl-matrix';
import Point, { PointLike } from '../geo/point';
import { mat2, mat4, vec4 } from 'gl-matrix';
import Point from '../geo/point';
import { clamp, interpolate, wrap } from '../util';
import Aabb from '../utils/Aabb';
import Frustum from '../utils/primitives';
import EdgeInsets, { IPaddingOptions } from './edge_insets';
import LngLat from './lng_lat';
import LngLatBounds from './lng_lat_bounds';

3
packages/map/src/handler/blockable_map_event.ts
View File

@ -1,8 +1,7 @@
// @ts-ignore
import { EarthMap } from '../earthmap';
import Point from '../geo/point';
import { Map } from '../map';
import { MapMouseEvent, MapTouchEvent, MapWheelEvent } from './events';
import { MapMouseEvent } from './events';
export default class BlockableMapEventHandler {
private map: Map | EarthMap;
private delayContextMenu: boolean;

3
packages/maps/src/amap/map.ts
View File

@ -16,11 +16,10 @@ import {
IStatusOptions,
IViewport,
MapServiceEvent,
MapStyle,
TYPES,
} from '@antv/l7-core';
import { DOM } from '@antv/l7-utils';
import { mat4, vec2, vec3 } from 'gl-matrix';
import { mat4, vec3 } from 'gl-matrix';
import { inject, injectable } from 'inversify';
import 'reflect-metadata';
import { IAMapEvent, IAMapInstance } from '../../typings/index';

6
packages/maps/src/amap2/map.ts
View File

@ -16,16 +16,14 @@ import {
IStatusOptions,
IViewport,
MapServiceEvent,
MapStyle,
Point,
TYPES,
} from '@antv/l7-core';
import { amap2Project, DOM } from '@antv/l7-utils';
import { mat4, vec2, vec3 } from 'gl-matrix';
import { inject, injectable } from 'inversify';
import 'reflect-metadata';
import { IAMapEvent, IAMapInstance } from '../../typings/index';
import { ISimpleMapCoord, SimpleMapCoord } from '../simpleMapCoord';
import { IAMapInstance } from '../../typings/index';
import { SimpleMapCoord } from '../simpleMapCoord';
import { toPaddingOptions } from '../utils';
import { Version } from '../version';
import './logo.css';

2
packages/maps/src/earth/Viewport.ts
View File

@ -1,4 +1,4 @@
import { IMapCamera, IViewport } from '@antv/l7-core';
import { IViewport } from '@antv/l7-core';
import { mat4, vec3 } from 'gl-matrix';
import WebMercatorViewport from 'viewport-mercator-project';

4
packages/maps/src/mapbox/map.ts
View File

@ -18,9 +18,9 @@ import {
TYPES,
} from '@antv/l7-core';
import { DOM } from '@antv/l7-utils';
import { mat4, vec2, vec3 } from 'gl-matrix';
import { mat4, vec3 } from 'gl-matrix';
import { inject, injectable } from 'inversify';
import mapboxgl, { IControl, Map } from 'mapbox-gl';
import mapboxgl, { Map } from 'mapbox-gl';
// tslint:disable-next-line:no-submodule-imports
import 'mapbox-gl/dist/mapbox-gl.css';
import 'reflect-metadata';

1
packages/renderer/src/regl/ReglFramebuffer.ts
View File

@ -1,5 +1,4 @@
import {
gl,
IFramebuffer,
IFramebufferInitializationOptions,
IRenderbuffer,

2
packages/renderer/src/regl/ReglModel.ts
View File

@ -8,7 +8,7 @@ import {
IUniform,
} from '@antv/l7-core';
import regl from 'l7regl';
import { cloneDeep, extend, isPlainObject, isTypedArray } from 'lodash';
import { cloneDeep, isPlainObject, isTypedArray } from 'lodash';
import {
blendEquationMap,
blendFuncMap,

7
packages/source/src/transform/cluster.ts
View File

@ -1,9 +1,4 @@
import {
IClusterOptions,
IParserData,
ISourceCFG,
ITransform,
} from '@antv/l7-core';
import { IClusterOptions, IParserData } from '@antv/l7-core';
// @ts-ignore
// tslint:disable-next-line:no-submodule-imports
import Supercluster from 'supercluster/dist/supercluster';

7
packages/source/src/transform/hexagon.ts
View File

@ -1,12 +1,7 @@
import { aProjectFlat, Satistics } from '@antv/l7-utils';
import { hexbin } from 'd3-hexbin';
const R_EARTH = 6378000;
import {
IParseDataItem,
IParserData,
ISourceCFG,
ITransform,
} from '@antv/l7-core';
import { IParseDataItem, IParserData, ITransform } from '@antv/l7-core';
interface IHexBinItem<T> extends Array<T> {
x: number;
y: number;

3
packages/three/src/core/baseLayer.ts
View File

@ -2,11 +2,8 @@ import { ILayer, IMercator } from '@antv/l7-core';
import { BaseLayer } from '@antv/l7-layers';
import {
AnimationMixer,
Camera,
Matrix4,
Object3D,
PCFSoftShadowMap,
PerspectiveCamera,
Scene,
Vector3,
WebGLRenderer,

2
packages/three/src/core/threeRenderService.ts
View File

@ -3,10 +3,8 @@ import { inject, injectable } from 'inversify';
import 'reflect-metadata';
import {
AnimationMixer,
Camera,
Matrix4,
PCFSoftShadowMap,
PerspectiveCamera,
Scene as ThreeScene,
WebGLRenderer,