@antv/l7-layers 2.9.26-alpha.1 → 2.9.27-alpha.0

package/es/core/BaseLayer.d.ts

@@ -20,6 +20,10 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     clusterZoom: number;
     layerType?: string | undefined;
     triangulation?: Triangulation | undefined;
+    defaultSourceConfig: {
+        data: any[];
+        options: ISourceCFG | undefined;
+    };
     dataState: IDataState;
     hooks: {
         init: SyncBailHook;

package/es/image/models/image.js

@@ -101,7 +101,7 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
         primitive: gl.TRIANGLES,
         blend: {
           // Tip: 优化显示效果
-          enable: false
+          enable: true
         },
         depth: {
           enable: false

package/es/index.d.ts

@@ -12,5 +12,6 @@ import RasterLayer from './raster';
 import EarthLayer from './earth';
 import MaskLayer from './mask';
 import WindLayer from './wind';
-export { BaseLayer, BaseModel, PointLayer, PolygonLayer, LineLayer, CityBuildingLayer, GeometryLayer, CanvasLayer, ImageLayer, RasterLayer, HeatmapLayer, EarthLayer, WindLayer, MaskLayer, };
+import TileDebugLayer from './tile/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

@@ -13,7 +13,8 @@ import PolygonLayer from "./polygon";
 import RasterLayer from "./raster";
 import EarthLayer from "./earth";
 import MaskLayer from "./mask";
-import WindLayer from "./wind"; // import ConfigSchemaValidationPlugin from './plugins/ConfigSchemaValidationPlugin';
+import WindLayer from "./wind";
+import TileDebugLayer from "./tile/tileTest"; // import ConfigSchemaValidationPlugin from './plugins/ConfigSchemaValidationPlugin';
 
 import DataMappingPlugin from "./plugins/DataMappingPlugin";
 import DataSourcePlugin from "./plugins/DataSourcePlugin";
@@ -102,5 +103,5 @@ container.bind(TYPES.ILayerPlugin).to(PixelPickingPlugin).inRequestScope();
  */
 
 container.bind(TYPES.ILayerPlugin).to(LayerModelPlugin).inRequestScope();
-export { BaseLayer, BaseModel, PointLayer, PolygonLayer, LineLayer, CityBuildingLayer, GeometryLayer, CanvasLayer, ImageLayer, RasterLayer, HeatmapLayer, EarthLayer, WindLayer, MaskLayer };
+export { BaseLayer, BaseModel, PointLayer, PolygonLayer, LineLayer, CityBuildingLayer, GeometryLayer, CanvasLayer, ImageLayer, RasterLayer, HeatmapLayer, EarthLayer, WindLayer, MaskLayer, TileDebugLayer };
 export * from "./core/interface";

package/es/line/index.d.ts

@@ -3,6 +3,23 @@ import { ILineLayerStyleOptions } from '../core/interface';
 import { LineModelType } from './models';
 export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
     type: string;
+    defaultSourceConfig: {
+        data: {
+            lng1: number;
+            lat1: number;
+            lng2: number;
+            lat2: number;
+        }[];
+        options: {
+            parser: {
+                type: string;
+                x: string;
+                y: string;
+                x1: string;
+                y1: string;
+            };
+        };
+    };
     buildModels(): void;
     rebuildModels(): void;
     protected getConfigSchema(): {

package/es/line/index.js

@@ -32,6 +32,24 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
 
     _defineProperty(_assertThisInitialized(_this), "type", 'LineLayer');
 
+    _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
+      data: [{
+        lng1: 100,
+        lat1: 30.0,
+        lng2: 130,
+        lat2: 30
+      }],
+      options: {
+        parser: {
+          type: 'json',
+          x: 'lng1',
+          y: 'lat1',
+          x1: 'lng2',
+          y1: 'lat2'
+        }
+      }
+    });
+
     return _this;
   }
 

package/es/mask/index.d.ts

@@ -3,6 +3,14 @@ import { IMaskLayerStyleOptions } from '../core/interface';
 import { MaskModelType } from './models';
 export default class MaskLayer extends BaseLayer<IMaskLayerStyleOptions> {
     type: string;
+    defaultSourceConfig: {
+        data: [];
+        options: {
+            parser: {
+                type: 'geojson';
+            };
+        };
+    };
     buildModels(): void;
     rebuildModels(): void;
     protected getConfigSchema(): {

package/es/plugins/DataSourcePlugin.js

@@ -4,7 +4,7 @@ import _createClass from "@babel/runtime/helpers/createClass";
 var _dec, _class;
 
 import { TYPES } from '@antv/l7-core';
-import Source, { DEFAULT_DATA, DEFAULT_PARSER, DEFAULT_SOURCE } from '@antv/l7-source';
+import Source from '@antv/l7-source';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
 var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
@@ -22,13 +22,8 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
         var source = layer.getSource();
 
         if (!source) {
-          // TODO: 允许用户不使用 layer 的 source 方法，在这里传入一个默认的替换的默认数据
-          var defaultSourceConfig = DEFAULT_SOURCE[layer.type] || {
-            data: DEFAULT_DATA,
-            options: DEFAULT_PARSER
-          };
-
-          var _ref = layer.sourceOption || defaultSourceConfig,
+          // Tip: 用户没有传入 source 的时候使用图层的默认数据
+          var _ref = layer.sourceOption || layer.defaultSourceConfig,
               data = _ref.data,
               options = _ref.options;
 
@@ -40,8 +35,7 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
           _this.updateClusterData(layer);
         } else {
           source.once('sourceUpdate', function () {
-            _this.updateClusterData(layer); // TODO: layer.hooks.init.call();
-
+            _this.updateClusterData(layer);
           });
         } // this.updateClusterData(layer);
 

package/es/plugins/FeatureScalePlugin.d.ts

@@ -7,6 +7,7 @@ export default class FeatureScalePlugin implements ILayerPlugin {
     private readonly configService;
     private scaleCache;
     private scaleOptions;
+    private getSourceData;
     apply(layer: ILayer, { styleAttributeService, }: {
         styleAttributeService: IStyleAttributeService;
     }): void;

package/es/plugins/FeatureScalePlugin.js

@@ -33,6 +33,19 @@ var FeatureScalePlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfi
   }
 
   _createClass(FeatureScalePlugin, [{
+    key: "getSourceData",
+    value: function getSourceData(layer, callback) {
+      var source = layer.getSource();
+
+      if (source.inited) {
+        callback(source.data);
+      } else {
+        source.once('sourceUpdate', function () {
+          callback(source.data);
+        });
+      }
+    }
+  }, {
     key: "apply",
     value: function apply(layer, _ref) {
       var _this = this;
@@ -41,23 +54,51 @@ var FeatureScalePlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfi
       layer.hooks.init.tap('FeatureScalePlugin', function () {
         _this.scaleOptions = layer.getScaleOptions();
         var attributes = styleAttributeService.getLayerStyleAttributes();
-        var dataArray = layer.getSource().data.dataArray;
 
-        if (dataArray.length === 0) {
-          return;
-        }
+        _this.getSourceData(layer, function (_ref2) {
+          var dataArray = _ref2.dataArray;
+
+          if (Array.isArray(dataArray) && dataArray.length === 0) {
+            return;
+          } else {
+            _this.caculateScalesForAttributes(attributes || [], dataArray);
+          }
+        }); // const { dataArray } = layer.getSource().data;
+        // if (dataArray.length === 0) {
+        //   return;
+        // }
+        // this.caculateScalesForAttributes(
+        //   attributes || [],
+        //   dataArray as IParseDataItem[],
+        // );
 
-        _this.caculateScalesForAttributes(attributes || [], dataArray);
       }); // 检测数据是否需要更新
 
       layer.hooks.beforeRenderData.tap('FeatureScalePlugin', function () {
         _this.scaleOptions = layer.getScaleOptions();
         var attributes = styleAttributeService.getLayerStyleAttributes();
-        var dataArray = layer.getSource().data.dataArray;
 
-        _this.caculateScalesForAttributes(attributes || [], dataArray);
+        _this.getSourceData(layer, function (_ref3) {
+          var dataArray = _ref3.dataArray;
+
+          if (Array.isArray(dataArray) && dataArray.length === 0) {
+            return;
+          }
+
+          _this.caculateScalesForAttributes(attributes || [], dataArray);
+
+          layer.layerModelNeedUpdate = true;
+        }); // const { dataArray } = layer.getSource().data;
+        // if (dataArray.length === 0) {
+        //   return;
+        // }
+        // this.caculateScalesForAttributes(
+        //   attributes || [],
+        //   dataArray
+        // );
+        // layer.layerModelNeedUpdate = true;
+
 
-        layer.layerModelNeedUpdate = true;
         return true;
       });
       layer.hooks.beforeRender.tap('FeatureScalePlugin', function () {
@@ -69,19 +110,34 @@ var FeatureScalePlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfi
         var attributes = styleAttributeService.getLayerStyleAttributes();
 
         if (attributes) {
-          var dataArray = layer.getSource().data.dataArray;
+          _this.getSourceData(layer, function (_ref4) {
+            var dataArray = _ref4.dataArray;
 
-          if (dataArray.length === 0) {
-            return;
-          }
+            if (dataArray.length === 0) {
+              return;
+            }
 
-          var attributesToRescale = attributes.filter(function (attribute) {
-            return attribute.needRescale;
-          });
+            var attributesToRescale = attributes.filter(function (attribute) {
+              return attribute.needRescale;
+            });
+
+            if (attributesToRescale.length) {
+              _this.caculateScalesForAttributes(attributesToRescale, dataArray);
+            }
+          }); // const { dataArray } = layer.getSource().data;
+          // if (dataArray.length === 0) {
+          //   return;
+          // }
+          // const attributesToRescale = attributes.filter(
+          //   (attribute) => attribute.needRescale,
+          // );
+          // if (attributesToRescale.length) {
+          //   this.caculateScalesForAttributes(
+          //     attributesToRescale,
+          //     dataArray,
+          //   );
+          // }
 
-          if (attributesToRescale.length) {
-            _this.caculateScalesForAttributes(attributesToRescale, dataArray);
-          }
         }
       });
     }
@@ -284,12 +340,12 @@ var FeatureScalePlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfi
 
   }, {
     key: "createDefaultScale",
-    value: function createDefaultScale(_ref2) {
-      var type = _ref2.type,
-          domain = _ref2.domain,
-          unknown = _ref2.unknown,
-          clamp = _ref2.clamp,
-          nice = _ref2.nice;
+    value: function createDefaultScale(_ref5) {
+      var type = _ref5.type,
+          domain = _ref5.domain,
+          unknown = _ref5.unknown,
+          clamp = _ref5.clamp,
+          nice = _ref5.nice;
       // @ts-ignore
       var scale = scaleMap[type]();
 

package/es/point/index.d.ts

@@ -3,6 +3,16 @@ import { IPointLayerStyleOptions } from '../core/interface';
 import { PointType } from './models/index';
 export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
     type: string;
+    defaultSourceConfig: {
+        data: never[];
+        options: {
+            parser: {
+                type: string;
+                x: string;
+                y: string;
+            };
+        };
+    };
     buildModels(): void;
     rebuildModels(): void;
     /**
@@ -25,6 +35,6 @@ export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
         blend: string;
     } | {} | {} | {
         blend: string;
-    } | {} | {} | {} | {};
+    } | {} | {} | {} | {} | {};
     protected getModelType(): PointType;
 }

package/es/point/index.js

@@ -38,6 +38,17 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
 
     _defineProperty(_assertThisInitialized(_this), "type", 'PointLayer');
 
+    _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
+      data: [],
+      options: {
+        parser: {
+          type: 'json',
+          x: 'lng',
+          y: 'lat'
+        }
+      }
+    });
+
     return _this;
   }
 
@@ -79,8 +90,7 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
             values = _this$shapeOption.values;
 
         var _this$getLayerConfig = this.getLayerConfig(),
-            shape2d = _this$getLayerConfig.shape2d,
-            shape3d = _this$getLayerConfig.shape3d;
+            shape2d = _this$getLayerConfig.shape2d;
 
         var iconMap = this.iconService.getIconMap();
 
@@ -144,6 +154,7 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
         },
         vectorpoint: {},
         tile: {},
+        tileText: {},
         earthFill: {},
         earthExtrude: {}
       };
@@ -152,7 +163,6 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
   }, {
     key: "getModelType",
     value: function getModelType() {
-      var PointTypes = ['fillImage', 'fill', 'radar', 'image', 'normal', 'simplePoint', 'extrude', 'text', 'vectorpoint', 'tile', 'earthFill', 'earthExtrude'];
       var parserType = this.layerSource.getParserType();
 
       if (isVectorTile(parserType)) {

package/es/point/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type PointType = 'fillImage' | 'fill' | 'radar' | 'image' | 'normal' | 'simplePoint' | 'extrude' | 'text' | 'vectorpoint' | 'tile' | 'earthFill' | 'earthExtrude';
+export declare type PointType = 'fillImage' | 'fill' | 'radar' | 'image' | 'normal' | 'simplePoint' | 'extrude' | 'text' | 'vectorpoint' | 'tile' | 'tileText' | 'earthFill' | 'earthExtrude';
 declare const PointModels: {
     [key in PointType]: any;
 };

package/es/point/models/index.js

@@ -10,6 +10,7 @@ import NormalModel from "./normal";
 import Radar from "./radar";
 import SimplePopint from "./simplePoint";
 import TextModel from "./text";
+import TileTextModel from "./tileText";
 import TileFillModel from "./tile";
 var PointModels = {
   fillImage: FillImageModel,
@@ -22,6 +23,7 @@ var PointModels = {
   text: TextModel,
   vectorpoint: PointTileModel,
   tile: TileFillModel,
+  tileText: TileTextModel,
   earthFill: EarthFillModel,
   earthExtrude: EarthExtrudeModel
 };

package/es/point/models/tileText.d.ts

@@ -0,0 +1,56 @@
+import { IEncodeFeature, IModel, IModelUniform } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+import { IGlyphQuad } from '../../utils/symbol-layout';
+export declare function TextTriangulation(feature: IEncodeFeature): {
+    vertices: number[];
+    indices: number[];
+    size: number;
+};
+export default class TextModel extends BaseModel {
+    glyphInfo: IEncodeFeature[];
+    glyphInfoMap: {
+        [key: string]: {
+            shaping: any;
+            glyphQuads: IGlyphQuad[];
+            centroid: number[];
+        };
+    };
+    private texture;
+    private currentZoom;
+    private extent;
+    private textureHeight;
+    private textCount;
+    private preTextStyle;
+    getUninforms(): IModelUniform;
+    initModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels: (callbackModel: (models: IModel[]) => void) => Promise<void>;
+    clearModels(): void;
+    protected registerBuiltinAttributes(): void;
+    private mapping;
+    private textExtent;
+    /**
+     * 生成文字纹理（生成文字纹理字典）
+     */
+    private initTextFont;
+    /**
+     * 生成 iconfont 纹理字典
+     */
+    private initIconFontTex;
+    /**
+     * 生成文字布局（对照文字纹理字典提取对应文字的位置很好信息）
+     */
+    private generateGlyphLayout;
+    /**
+     * 文字避让 depend on originCentorid
+     */
+    private filterGlyphs;
+    /**
+     * 初始化文字布局
+     */
+    private initGlyph;
+    /**
+     * 更新文字纹理
+     */
+    private updateTexture;
+    private reBuildModel;
+}