@antv/l7-layers 2.9.36 → 2.9.37-alpha.1

package/es/Geometry/index.d.ts

@@ -18,15 +18,6 @@ export default class GeometryLayer extends BaseLayer<IGeometryLayerStyleOptions>
     };
     buildModels(): void;
     rebuildModels(): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected getDefaultConfig(): {} | {} | {};
     protected getModelType(): GeometryModelType;
 }

package/es/Geometry/index.js

@@ -68,19 +68,6 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
         _this3.dispatchModelLoad(models);
       });
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "getDefaultConfig",
     value: function getDefaultConfig() {

package/es/Geometry/models/billboard.d.ts

@@ -13,14 +13,5 @@ export default class BillBoardModel extends BaseModel {
     initModels(callbackModel: (models: IModel[]) => void): void;
     buildModels(callbackModel: (models: IModel[]) => void): void;
     updateTexture(drawCanvas: (canvas: HTMLCanvasElement) => void): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected registerBuiltinAttributes(): void;
 }

package/es/Geometry/models/billboard.js

@@ -169,19 +169,6 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
         this.layerService.reRender();
       }
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/Geometry/models/plane.d.ts

@@ -32,14 +32,5 @@ export default class PlaneModel extends BaseModel {
      * load terrain texture & offset attribute z
      */
     protected loadTerrainTexture(positions: number[], indices: number[]): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected registerBuiltinAttributes(): void;
 }

package/es/Geometry/models/plane.js

@@ -376,19 +376,6 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
         terrainImage.src = terrainTexture;
       }
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/Geometry/models/sprite.d.ts

@@ -33,15 +33,6 @@ export default class SpriteModel extends BaseModel {
     initModels(callbackModel: (models: IModel[]) => void): void;
     buildModels(callbackModel: (models: IModel[]) => void): void;
     updateTexture(mapTexture: string | undefined): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected registerBuiltinAttributes(): string;
 }
 export {};

package/es/Geometry/models/sprite.js

@@ -275,19 +275,6 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
         });
       }
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/canvas/index.d.ts

@@ -9,15 +9,6 @@ export default class CanvasLayer extends BaseLayer<ICanvasLayerStyleOptions> {
     rebuildModels(): void;
     hide(): ILayer;
     renderModels(): this;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected getDefaultConfig(): {};
     protected getModelType(): CanvasModelType;
 }

package/es/canvas/index.js

@@ -86,19 +86,6 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
       });
       return this;
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "getDefaultConfig",
     value: function getDefaultConfig() {

package/es/citybuliding/building.d.ts

@@ -4,14 +4,5 @@ export default class CityBuildingLayer extends BaseLayer {
     buildModels(): void;
     rebuildModels(): void;
     setLight(t: number): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected getModelType(): string;
 }

package/es/citybuliding/building.js

@@ -60,19 +60,6 @@ var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
         time: t
       });
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "getModelType",
     value: function getModelType() {

package/es/core/BaseLayer.d.ts

@@ -1,5 +1,5 @@
 import { SyncBailHook, SyncHook, SyncWaterfallHook } from '@antv/async-hook';
-import { BlendType, IActiveOption, IAnimateOption, IAttributeAndElements, ICameraService, ICoordinateSystemService, IDataState, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPlugin, ILayerService, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
+import { BlendType, IActiveOption, IAnimateOption, IAttributeAndElements, ICameraService, ICoordinateSystemService, IDataState, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPlugin, ILayerService, ILegend, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { EventEmitter } from 'eventemitter3';
 import { Container } from 'inversify';
@@ -188,6 +188,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     setEncodedData(encodedData: IEncodeFeature[]): void;
     getEncodedData(): IEncodeFeature[];
     getScale(name: string): any;
+    getLegend(name: string): ILegend;
     getLegendItems(name: string): LegendItems;
     pick({ x, y }: {
         x: number;
@@ -212,7 +213,6 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
      * @param time
      */
     setEarthTime(time: number): void;
-    protected getConfigSchema(): void;
     protected getModelType(): unknown;
     protected getDefaultConfig(): {};
     protected sourceEvent: () => void;

package/es/core/BaseLayer.js

@@ -793,6 +793,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         visible: true
       });
       this.reRender();
+      this.emit('show');
       return this;
     }
   }, {
@@ -802,6 +803,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         visible: false
       });
       this.reRender();
+      this.emit('hide');
       return this;
     }
   }, {
@@ -973,7 +975,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       this.masks = [];
       this.hooks.beforeDestroy.call(); // 清除sources事件
 
-      this.layerSource.off('sourceUpdate', this.sourceEvent);
+      this.layerSource.off('update', this.sourceEvent);
       (_this$multiPassRender = this.multiPassRenderer) === null || _this$multiPassRender === void 0 ? void 0 : _this$multiPassRender.destroy(); // 清除所有属性以及关联的 vao == 销毁所有 => model this.models.forEach((model) => model.destroy());
 
       this.styleAttributeService.clearAllAttributes(); // 执行每个图层单独的 clearModels 方法 （清除一些额外的 texture、program、buffer 等）
@@ -1027,7 +1029,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       // 清除旧 sources 事件
       if (this.layerSource) {
-        this.layerSource.off('sourceUpdate', this.sourceEvent);
+        this.layerSource.off('update', this.sourceEvent);
       }
 
       this.layerSource = source;
@@ -1041,17 +1043,16 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       if (this.layerSource.inited) {
         this.sourceEvent();
-      } // this.layerSource.inited 为 true 后，sourceUpdate 事件不会再触发
+      } // this.layerSource.inited 为 true update 事件不会再触发
 
 
-      this.layerSource.on('sourceUpdate', function () {
+      this.layerSource.on('update', function () {
         if (_this8.coordCenter === undefined) {
+          var _this8$mapService;
+
           var layerCenter = _this8.layerSource.center;
           _this8.coordCenter = layerCenter;
-          _this8.mapService.setCoordCenter && _this8.mapService.setCoordCenter(layerCenter); // // @ts-ignore
-          // this.mapService.map.customCoords.setCenter(layerCenter);
-          // // @ts-ignore
-          // this.mapService.setCustomCoordCenter(layerCenter);
+          ((_this8$mapService = _this8.mapService) === null || _this8$mapService === void 0 ? void 0 : _this8$mapService.setCoordCenter) && _this8.mapService.setCoordCenter(layerCenter);
         }
 
         _this8.sourceEvent();
@@ -1083,6 +1084,19 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function getScale(name) {
       return this.styleAttributeService.getLayerAttributeScale(name);
     }
+  }, {
+    key: "getLegend",
+    value: function getLegend(name) {
+      var _attribute$scale, _scales$0$option, _attribute$scale2;
+
+      var attribute = this.styleAttributeService.getLayerStyleAttribute(name);
+      var scales = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
+      return {
+        type: (_scales$0$option = scales[0].option) === null || _scales$0$option === void 0 ? void 0 : _scales$0$option.type,
+        field: attribute === null || attribute === void 0 ? void 0 : (_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.field,
+        items: this.getLegendItems(name)
+      };
+    }
   }, {
     key: "getLegendItems",
     value: function getLegendItems(name) {
@@ -1372,11 +1386,6 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function setEarthTime(time) {
       console.warn('empty fn');
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      throw new Error('Method not implemented.');
-    }
   }, {
     key: "getModelType",
     value: function getModelType() {

package/es/core/BaseModel.js

@@ -19,6 +19,7 @@ import { rgb2arr } from '@antv/l7-utils';
 import { color } from 'd3-color';
 import { isEqual, isNumber, isString } from 'lodash';
 import { BlendTypes } from "../utils/blend";
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function () {
   // style texture data mapping
   // 用于数据传递的数据纹理

package/es/core/triangulation.d.ts

@@ -110,6 +110,8 @@ export declare function HeatmapTriangulation(feature: IEncodeFeature): {
     indices: number[];
     size: number;
 };
+export declare function computeVertexNormals(positions: number[], indexArray: number[], dim?: number, needFlat?: boolean): Float32Array;
+export declare function checkIsClosed(points: number[][][]): boolean;
 /**
  * 构建地球三角网格
  * @returns

package/es/core/triangulation.js

@@ -393,7 +393,6 @@ export function HeatmapTriangulation(feature) {
     coordinates.push(0);
   }
 
-  var size = feature.size;
   var dir = addDir(-1, 1);
   var dir1 = addDir(1, 1);
   var dir2 = addDir(-1, -1);
@@ -425,7 +424,7 @@ function getGeometry(shape) {
   return geometry;
 }
 
-function computeVertexNormals(positions, indexArray) {
+export function computeVertexNormals(positions, indexArray) {
   var dim = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 3;
   var needFlat = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var normals = new Float32Array(positions.length / dim * 3);
@@ -497,7 +496,7 @@ function normalizeNormals(normals) {
   }
 }
 
-function checkIsClosed(points) {
+export function checkIsClosed(points) {
   var p1 = points[0][0];
   var p2 = points[0][points[0].length - 1];
   return p1[0] === p2[0] && p1[1] === p2[1];

package/es/glsl.d.ts

@@ -0,0 +1,5 @@
+declare module '*.glsl' {
+  const content: string;
+  // @ts-ignore
+  export default content;
+}

package/es/heatmap/index.d.ts

@@ -8,14 +8,5 @@ export default class HeatMapLayer extends BaseLayer<IHeatMapLayerStyleOptions> {
     rebuildModels(): void;
     renderModels(): this;
     updateModelData(data: IAttributeAndElements): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected getModelType(): HeatMapModelType;
 }

package/es/heatmap/index.js

@@ -92,19 +92,6 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
         console.warn('data error');
       }
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "getModelType",
     value: function getModelType() {

package/es/heatmap/models/heatmap.js

@@ -213,8 +213,7 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
                       dstRGB: gl.ONE,
                       dstAlpha: 1
                     }
-                  },
-                  pick: false
+                  }
                 });
 
               case 3:
@@ -260,7 +259,6 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
           createBuffer = _this$rendererService3.createBuffer,
           createModel = _this$rendererService3.createModel;
       return createModel({
-        pick: false,
         vs: vs,
         fs: fs,
         attributes: {

package/es/image/index.d.ts

@@ -5,15 +5,6 @@ export default class ImageLayer extends BaseLayer<IImageLayerStyleOptions> {
     type: string;
     buildModels(): void;
     rebuildModels(): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected getDefaultConfig(): {} | {} | {};
     protected getModelType(): ImageModelType;
 }

package/es/image/index.js

@@ -54,19 +54,6 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
         _this3.dispatchModelLoad(models);
       });
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "getDefaultConfig",
     value: function getDefaultConfig() {

package/es/image/models/dataImage.d.ts

@@ -8,15 +8,6 @@ export default class ImageDataModel extends BaseModel {
     initModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     buildModels(callbackModel: (models: IModel[]) => void): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected registerBuiltinAttributes(): void;
     private updateColorTexture;
 }

package/es/image/models/dataImage.js

@@ -121,8 +121,7 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
           enable: false
         },
         blend: this.getBlend(),
-        stencil: getMask(mask, maskInside),
-        pick: false
+        stencil: getMask(mask, maskInside)
       }).then(function (model) {
         callbackModel([model]);
       }).catch(function (err) {
@@ -143,19 +142,6 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
     value: function buildModels(callbackModel) {
       this.initModels(callbackModel);
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/image/models/image.d.ts

@@ -6,14 +6,5 @@ export default class ImageModel extends BaseModel {
     initModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     buildModels(callbackModel: (models: IModel[]) => void): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected registerBuiltinAttributes(): void;
 }

package/es/image/models/image.js

@@ -102,8 +102,7 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
         depth: {
           enable: false
         },
-        stencil: getMask(mask, maskInside),
-        pick: false
+        stencil: getMask(mask, maskInside)
       }).then(function (model) {
         callbackModel([model]);
       }).catch(function (err) {
@@ -123,19 +122,6 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     value: function buildModels(callbackModel) {
       this.initModels(callbackModel);
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/image/models/tileDataImage.d.ts

@@ -6,14 +6,5 @@ export default class ImageDataModel extends BaseModel {
     initModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     buildModels(callbackModel: (models: IModel[]) => void): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected registerBuiltinAttributes(): void;
 }

package/es/image/models/tileDataImage.js

@@ -112,8 +112,7 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
           enable: false
         },
         blend: this.getBlend(),
-        stencil: getMask(mask, maskInside),
-        pick: false
+        stencil: getMask(mask, maskInside)
       }).then(function (model) {
         callbackModel([model]);
       }).catch(function (err) {
@@ -133,19 +132,6 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
     value: function buildModels(callbackModel) {
       this.initModels(callbackModel);
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/index.d.ts

@@ -12,6 +12,6 @@ import RasterLayer from './raster';
 import EarthLayer from './earth';
 import MaskLayer from './mask';
 import WindLayer from './wind';
-import TileDebugLayer from './tile/tileTest';
+import TileDebugLayer from './tile/tileFactory/layers/tileTest';
 export { BaseLayer, BaseModel, PointLayer, PolygonLayer, LineLayer, CityBuildingLayer, GeometryLayer, CanvasLayer, ImageLayer, RasterLayer, HeatmapLayer, EarthLayer, WindLayer, MaskLayer, TileDebugLayer };
 export * from './core/interface';

package/es/index.js

@@ -14,7 +14,7 @@ import RasterLayer from "./raster";
 import EarthLayer from "./earth";
 import MaskLayer from "./mask";
 import WindLayer from "./wind";
-import TileDebugLayer from "./tile/tileTest"; // import ConfigSchemaValidationPlugin from './plugins/ConfigSchemaValidationPlugin';
+import TileDebugLayer from "./tile/tileFactory/layers/tileTest"; // import ConfigSchemaValidationPlugin from './plugins/ConfigSchemaValidationPlugin';
 
 import DataMappingPlugin from "./plugins/DataMappingPlugin";
 import DataSourcePlugin from "./plugins/DataSourcePlugin";

package/es/line/index.d.ts

@@ -23,15 +23,6 @@ export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
     };
     buildModels(): void;
     rebuildModels(): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected getDefaultConfig(): {} | {} | {} | {} | {
         blend: string;
     } | {