Realase 0706

.github/actions/prepare-install/action.yml

@@ -10,8 +10,6 @@ runs:
   using: 'composite'
   steps:
     - uses: pnpm/action-setup@v3
-      with:
-        version: 8
 
     - name: Use Node.js ${{ inputs.node-version }}
       uses: actions/setup-node@v4

.gitignore

@@ -10,7 +10,6 @@ yarn-debug.log*
 yarn-error.log*
 yarn.lock
 package-lock.json
-pnpm-lock.yaml
 
 # Runtime data
 pids

examples/constants.ts

@@ -2,9 +2,7 @@ import type { GUIOptions, TestCaseBasemap } from './types';
 
 export const DEFAULT_GUI_OPTIONS: GUIOptions = {
   map: 'Map',
-  renderer: 'device',
   animate: false,
-  enableWebGPU: false,
 };
 
 export const SEARCH_PARAMS_KEYS = ['namespace', 'name', 'snapshot'].concat(

examples/demos/extend/three-animation.ts

@@ -11,7 +11,6 @@ export const threeAnimation: TestCase = async (options) => {
   const scene = await CaseScene({
     ...options,
     // Three.js r163+ 需要 WebGL2，必须使用 'device' 渲染器
-    renderer: 'device',
     mapConfig: {
       style: 'dark',
       center: [116.4074, 39.9042],

examples/demos/extend/three-buildings.ts

@@ -11,7 +11,6 @@ export const threeBuildings: TestCase = async (options) => {
   const scene = await CaseScene({
     ...options,
     // Three.js r163+ 需要 WebGL2，必须使用 'device' 渲染器
-    renderer: 'device',
     mapConfig: {
       style: 'dark',
       // 数据位于深圳区域

examples/demos/extend/three-earthquake.ts

@@ -11,7 +11,6 @@ export const threeEarthquake: TestCase = async (options) => {
   const scene = await CaseScene({
     ...options,
     // Three.js r163+ 需要 WebGL2，必须使用 'device' 渲染器
-    renderer: 'device',
     mapConfig: {
       style: 'dark',
       center: [-120, 37],

examples/demos/extend/three-geometry.ts

@@ -7,7 +7,6 @@ export const threeGeometry: TestCase = async (options) => {
   const scene = await CaseScene({
     ...options,
     // Three.js r163+ 需要 WebGL2，必须使用 'device' 渲染器
-    renderer: 'device',
     mapConfig: {
       style: 'dark',
       center: [111.4453125, 32.84267363195431],

examples/demos/extend/three-particles.ts

@@ -11,7 +11,6 @@ export const threeParticles: TestCase = async (options) => {
   const scene = await CaseScene({
     ...options,
     // Three.js r163+ 需要 WebGL2，必须使用 'device' 渲染器
-    renderer: 'device',
     mapConfig: {
       style: 'dark',
       center: [112, 28],

examples/demos/extend/three-shader.ts

@@ -11,7 +11,6 @@ export const threeShader: TestCase = async (options) => {
   const scene = await CaseScene({
     ...options,
     // Three.js r163+ 需要 WebGL2，必须使用 'device' 渲染器
-    renderer: 'device',
     mapConfig: {
       style: 'dark',
       center: [121.48, 31.24],

examples/types.ts

@@ -1,17 +1,21 @@
 import type { Scene } from '@antv/l7';
-import type { ISceneConfig } from '@antv/l7-core';
 import type { Controller, GUI } from 'lil-gui';
 
 export type GUIOptions = {
   map: TestCaseBasemap;
-  renderer: ISceneConfig['renderer'];
   animate: boolean;
-  enableWebGPU: boolean;
   [keys: string]: any;
 };
 
 export type TestCaseBasemap =
-  'Map' | 'GaodeMap' | 'BaiduMap' | 'MapLibre' | 'TencentMap' | 'Mapbox' | 'TMap' | 'GoogleMap';
+  | 'Map'
+  | 'GaodeMap'
+  | 'BaiduMap'
+  | 'MapLibre'
+  | 'TencentMap'
+  | 'Mapbox'
+  | 'TMap'
+  | 'GoogleMap';
 
 export type TestCaseOptions = GUIOptions & {
   id: string | HTMLDivElement;

examples/utils/scene.ts

@@ -8,7 +8,7 @@ type CaseSceneOptions = TestCaseOptions & {
 };
 
 export const CaseScene = (options: CaseSceneOptions) => {
-  const { map: basemap, animate, mapConfig, renderer } = options;
+  const { map: basemap, animate, mapConfig } = options;
 
   const isMapbox = ['MapLibre', 'Mapbox'].includes(basemap);
   const isGoogleMap = basemap === 'GoogleMap';
@@ -47,7 +47,6 @@ export const CaseScene = (options: CaseSceneOptions) => {
   const scene = new Scene({
     ...options,
     map,
-    renderer: renderer || 'regl', // 默认使用 regl，Three.js demo 需要传入 'device'
     shaderCompilerPath: '/glsl_wgsl_compiler_bg.wasm',
     // logoVisible: false,
   });

package.json

@@ -2,6 +2,7 @@
   "name": "l7-monorepo",
   "private": true,
   "type": "module",
+  "packageManager": "pnpm@8.15.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/antvis/L7"
@@ -25,7 +26,7 @@
     "test-cover": "cross-env NODE_OPTIONS='--max-old-space-size=8192' jest --config ./jest.config.ts --coverage",
     "test:integration": "cross-env NODE_OPTIONS='--max-old-space-size=8192' jest --config ./jest.e2e.config.ts",
     "test:size": "pnpm --filter @antv/l7 build && limit-size",
-    "clean-dist": "pnpm --parallel -r --filter !@antv/l7-site clean",
+    "clean-dist": "pnpm --parallel -r --filter !@antv/l7-site run clean",
     "clean-deps": "./scripts/clean-deps.sh",
     "build": "npm run clean-dist && pnpm --parallel -r --filter !@antv/l7-site exec father build",
     "changeset": "changeset add",
@@ -77,6 +78,7 @@
   },
   "devDependencies": {
     "@antv/async-hook": "^2.2.9",
+    "@antv/l7": "workspace:*",
     "@antv/l7-draw": "^3.1.5",
     "@antv/translator": "^1.0.1",
     "@changesets/changelog-github": "^0.5.0",
@@ -137,10 +139,5 @@
   },
   "resolutions": {
     "@monaco-editor/loader": "1.5.0"
-  },
-  "pnpm": {
-    "overrides": {
-      "@monaco-editor/loader": "1.5.0"
-    }
   }
 }

packages/component/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-component",
-  "version": "2.28.14",
+  "version": "2.29.0",
   "description": "Component for L7",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-core",
-  "version": "2.28.14",
+  "version": "2.29.0",
   "description": "",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",

packages/core/src/services/config/IConfigService.ts

@@ -17,9 +17,9 @@ export interface ISceneConfig extends IRenderConfig {
   stencil?: boolean;
   debug?: boolean;
   /**
-   * Support regl & @antv/g-device-api now
+   * Renderer engine
    */
-  renderer?: 'regl' | 'device';
+  renderer?: 'device';
 }
 
 export interface IGlobalConfigService {

packages/l7/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7",
-  "version": "2.28.14",
+  "version": "2.29.0",
   "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
   "repository": "git@github.com:antvis/L7.git",
   "license": "MIT",

packages/layers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.28.14",
+  "version": "2.29.0",
   "description": "L7's collection of built-in layers",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",

packages/layers/src/core/interface.ts

@@ -186,22 +186,6 @@ export interface IMaskLayerStyleOptions extends IBaseLayerStyleOptions {
   sourceLayer?: string;
 }
 
-export interface IWindLayerStyleOptions extends IBaseLayerStyleOptions {
-  uMin?: number;
-  uMax?: number;
-  vMin?: number;
-  vMax?: number;
-  fadeOpacity?: number;
-  speedFactor?: number;
-  dropRate?: number;
-  dropRateBump?: number;
-  numParticles?: number;
-  rampColors?: {
-    [key: number]: string;
-  };
-  sizeScale?: number;
-}
-
 export interface IImageLayerStyleOptions extends IBaseLayerStyleOptions {
   domain?: [number, number];
   noDataValue?: number;
@@ -337,7 +321,13 @@ export interface IRasterTerrainLayerStyleOptions extends IBaseRasterLayerStyleOp
   offset?: number;
 }
 export type ArrowType =
-  'circle' | 'triangle' | 'rect' | 'diamond' | 'classic' | 'halfTriangle' | 'none';
+  | 'circle'
+  | 'triangle'
+  | 'rect'
+  | 'diamond'
+  | 'classic'
+  | 'halfTriangle'
+  | 'none';
 export interface IArrowOptions {
   type: ArrowType;
   width?: number;

packages/layers/src/index.ts

@@ -15,7 +15,6 @@ import TileDebugLayer from './tile/core/TileDebugLayer';
 import EarthLayer from './earth';
 
 import MaskLayer from './mask';
-import WindLayer from './wind';
 
 export * from './core/interface';
 export {
@@ -34,5 +33,4 @@ export {
   RasterLayer,
   TileDebugLayer,
   TileLayer,
-  WindLayer,
 };