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

package/es/line/index.js

@@ -75,19 +75,6 @@ var LineLayer = /*#__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/line/models/great_circle.js

@@ -233,7 +233,7 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
             type: gl.FLOAT
           },
           size: 1,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var _feature$size = feature.size,
                 size = _feature$size === void 0 ? 1 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
@@ -252,7 +252,7 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
             type: gl.FLOAT
           },
           size: 4,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4], vertex[5], vertex[6]];
           }
         }
@@ -269,7 +269,7 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
             type: gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var iconMap = _this2.iconService.getIconMap();
 
             var texture = feature.texture; // console.log('icon feature', feature)

package/es/mask/index.d.ts

@@ -14,14 +14,5 @@ export default class MaskLayer extends BaseLayer<IMaskLayerStyleOptions> {
     init(): this;
     buildModels(): void;
     rebuildModels(): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected getModelType(): MaskModelType;
 }

package/es/mask/index.js

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

package/es/plugins/DataMappingPlugin.js

@@ -38,7 +38,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
             styleAttributeService: styleAttributeService
           });
         } else {
-          source.once('sourceUpdate', function () {
+          source.once('update', function () {
             _this.generateMaping(layer, {
               styleAttributeService: styleAttributeService
             });
@@ -54,7 +54,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
             styleAttributeService: styleAttributeService
           });
         } else {
-          source.once('sourceUpdate', function () {
+          source.once('update', function () {
             _this.generateMaping(layer, {
               styleAttributeService: styleAttributeService
             });

package/es/plugins/DataSourcePlugin.js

@@ -34,7 +34,7 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
         if (source.inited) {
           _this.updateClusterData(layer);
         } else {
-          source.once('sourceUpdate', function () {
+          source.once('update', function () {
             _this.updateClusterData(layer);
           });
         }

package/es/plugins/FeatureScalePlugin.js

@@ -33,7 +33,7 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       if (source.inited) {
         callback(source.data);
       } else {
-        source.once('sourceUpdate', function () {
+        source.once('update', function () {
           callback(source.data);
         });
       }
@@ -120,7 +120,8 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       attributes.forEach(function (attribute) {
         if (attribute.scale) {
           // 创建Scale
-          var attributeScale = attribute.scale;
+          var attributeScale = attribute.scale; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
           attributeScale.names = _this2.parseFields(attribute.scale.field || []);
           var scales = []; // 为每个字段创建 Scale
 
@@ -238,7 +239,8 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
         }
 
         return styleScale;
-      }
+      } // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
 
       var firstValue = (_find = data.find(function (d) {
         return !isNil(d[field]);

package/es/plugins/LayerModelPlugin.js

@@ -57,7 +57,7 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
         if (source.inited) {
           _this.prepareLayerModel(layer);
         } else {
-          source.once('sourceUpdate', function () {
+          source.once('update', function () {
             _this.prepareLayerModel(layer);
           });
         }

package/es/plugins/LightingPlugin.js

@@ -56,7 +56,7 @@ export function generateLightingUniforms(lights) {
     lights = [DEFAULT_LIGHT];
   }
 
-  lights.forEach(function (_ref, i) {
+  lights.forEach(function (_ref) {
     var _ref$type = _ref.type,
         type = _ref$type === void 0 ? 'directional' : _ref$type,
         rest = _objectWithoutProperties(_ref, _excluded);

package/es/plugins/RegisterStyleAttributePlugin.js

@@ -6,6 +6,7 @@ var _dec, _class;
 import { AttributeType, gl } from '@antv/l7-core';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
+import { isTileGroup } from "../tile/utils";
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
@@ -22,32 +23,26 @@ var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE
 
       var styleAttributeService = _ref.styleAttributeService;
       layer.hooks.init.tap('RegisterStyleAttributePlugin', function () {
+        // 过滤 tileGroup layer （瓦片图层不需要注册）
+        if (isTileGroup(layer)) return;
+
         _this.registerBuiltinAttributes(styleAttributeService, layer);
       });
     }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes(styleAttributeService, layer) {
-      // 过滤 tileGroup layer （瓦片图层）
-      var source = layer.getSource();
-
-      switch (source.parser.type) {
-        case 'mvt':
-        case 'testTile':
-        case 'rasterTile':
-          // layer 仅作为 group 使用
-          return;
-      }
-
+      // MaskLayer 只需要注册 a_Position
       if (layer.type === 'MaskLayer') {
         this.registerPositionAttribute(styleAttributeService);
         return;
-      }
+      } // 用途为 basemap 的 Layer 也只需要注册 a_Position
+
 
       var _layer$getLayerConfig = layer.getLayerConfig(),
           usage = _layer$getLayerConfig.usage;
 
-      if (usage === 'basemap ') {
+      if (usage === 'basemap') {
         this.registerPositionAttribute(styleAttributeService);
         return;
       }

package/es/plugins/UpdateStyleAttributePlugin.js

@@ -58,7 +58,7 @@ var UpdateStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__
       }).forEach(function (attribute) {
         // 精确更新某个/某些 feature(s)，需要传入 featureIdx d
         styleAttributeService.updateAttributeByFeatureRange(attribute.name, layer.getEncodedData(), // 获取经过 mapping 最新的数据
-        attribute.featureRange.startIndex, attribute.featureRange.endIndex);
+        attribute.featureRange.startIndex, attribute.featureRange.endIndex, layer);
         attribute.needRegenerateVertices = false;
       });
     }

package/es/point/index.d.ts

@@ -20,15 +20,6 @@ export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
      * @returns
      */
     getModelTypeWillEmptyData(): PointType;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected getDefaultConfig(): {} | {
         blend: string;
     } | {} | {} | {

package/es/point/index.js

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

package/es/point/models/earthFill.js

@@ -218,7 +218,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
             type: gl.FLOAT
           },
           size: 1,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var _feature$size = feature.size,
                 size = _feature$size === void 0 ? 5 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
@@ -238,7 +238,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
             type: gl.FLOAT
           },
           size: 1,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var _feature$shape = feature.shape,
                 shape = _feature$shape === void 0 ? 2 : _feature$shape;
 

package/es/point/models/image.js

@@ -214,7 +214,7 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
             type: gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature) {
             var iconMap = _this2.iconService.getIconMap();
 
             var shape = feature.shape;

package/es/polygon/index.d.ts

@@ -13,15 +13,6 @@ export default class PolygonLayer extends BaseLayer<IPolygonLayerStyleOptions> {
     };
     buildModels(): void;
     rebuildModels(): void;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     protected getModelType(): PolygonModelType;
     protected getPointModelType(): PolygonModelType;
 }

package/es/polygon/index.js

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

package/es/polygon/models/ocean.js

@@ -84,8 +84,7 @@ var OceanModel = /*#__PURE__*/function (_BaseModel) {
         depth: {
           enable: false
         },
-        stencil: getMask(mask, maskInside),
-        pick: false
+        stencil: getMask(mask, maskInside)
       }).then(function (model) {
         callbackModel([model]);
       }).catch(function (err) {

package/es/polygon/models/water.js

@@ -79,8 +79,7 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
         depth: {
           enable: false
         },
-        stencil: getMask(mask, maskInside),
-        pick: false
+        stencil: getMask(mask, maskInside)
       }).then(function (model) {
         callbackModel([model]);
       }).catch(function (err) {

package/es/raster/index.d.ts

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

package/es/raster/index.js

@@ -54,19 +54,6 @@ var RaterLayer = /*#__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/raster/models/raster.js

@@ -160,8 +160,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   depth: {
                     enable: false
                   },
-                  stencil: getMask(mask, maskInside),
-                  pick: false
+                  stencil: getMask(mask, maskInside)
                 }).then(function (model) {
                   callbackModel([model]);
                 }).catch(function (err) {

package/es/raster/models/rasterRgb.js

@@ -161,8 +161,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   depth: {
                     enable: false
                   },
-                  stencil: getMask(mask, maskInside),
-                  pick: false
+                  stencil: getMask(mask, maskInside)
                 }).then(function (model) {
                   callbackModel([model]);
                 }).catch(function (err) {

package/es/raster/models/rasterTile.js

@@ -91,8 +91,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         depth: {
           enable: false
         },
-        stencil: getMask(mask, maskInside),
-        pick: false
+        stencil: getMask(mask, maskInside)
       }).then(function (model) {
         callbackModel([model]);
       }).catch(function (err) {

package/es/raster/raster.d.ts

@@ -16,15 +16,6 @@ export default class RasterLayer extends BaseLayer<IRasterLayerStyleOptions> {
     getAnimateUniforms(): IModelUniform;
     buildModels(): void;
     renderModels(): this;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
     private buildRasterModel;
 }
 export {};

package/es/raster/raster.js

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

package/es/tile/interaction/TilePickService.d.ts

@@ -0,0 +1,16 @@
+import { ILayer, IPickingService, IRendererService, IInteractionTarget, ITileRenderService } from '@antv/l7-core';
+import { EventEmitter } from 'eventemitter3';
+export declare class TilePickService extends EventEmitter {
+    isLastPicked: boolean;
+    private rendererService;
+    private pickingService;
+    private children;
+    private parent;
+    private tileRenderService;
+    constructor(parent: ILayer, rendererService: IRendererService, pickingService: IPickingService, children: ILayer[], tileRenderService: ITileRenderService);
+    pick(layers: ILayer[], target: IInteractionTarget): boolean;
+    clearPick(): void;
+    beforeHighlight(pickedColors: any): void;
+    beforeSelect(pickedColors: any): void;
+    destroy(): void;
+}

package/es/tile/{manager/tilePickerManager.js → interaction/TilePickService.js}

@@ -11,16 +11,15 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 import { EventEmitter } from 'eventemitter3';
+export var TilePickService = /*#__PURE__*/function (_EventEmitter) {
+  _inherits(TilePickService, _EventEmitter);
 
-var TilePickManager = /*#__PURE__*/function (_EventEmitter) {
-  _inherits(TilePickManager, _EventEmitter);
+  var _super = _createSuper(TilePickService);
 
-  var _super = _createSuper(TilePickManager);
-
-  function TilePickManager(parent, rendererService, pickingService, children) {
+  function TilePickService(parent, rendererService, pickingService, children, tileRenderService) {
     var _this;
 
-    _classCallCheck(this, TilePickManager);
+    _classCallCheck(this, TilePickService);
 
     _this = _super.call(this);
 
@@ -30,66 +29,26 @@ var TilePickManager = /*#__PURE__*/function (_EventEmitter) {
     _this.rendererService = rendererService;
     _this.pickingService = pickingService;
     _this.children = children;
+    _this.tileRenderService = tileRenderService;
     return _this;
   }
-  /**
-   *
-   * @param layers
-   */
-
 
-  _createClass(TilePickManager, [{
-    key: "normalRender",
-    value: function normalRender(layers) {
+  _createClass(TilePickService, [{
+    key: "pick",
+    value: function pick(layers, target) {
       var _this2 = this;
 
-      layers.filter(function (layer) {
-        return layer.inited;
-      }).filter(function (layer) {
-        return layer.isVisible();
-      }).map(function (layer) {
-        layer.hooks.beforeRenderData.call();
-        layer.hooks.beforeRender.call();
-
-        if (layer.masks.length > 0) {
-          // 清除上一次的模版缓存
-          _this2.rendererService.clear({
-            stencil: 0,
-            depth: 1,
-            framebuffer: null
-          });
-
-          layer.masks.map(function (m) {
-            m.hooks.beforeRenderData.call();
-            m.hooks.beforeRender.call();
-            m.render();
-            m.hooks.afterRender.call();
-          });
-        }
-
-        layer.render();
-        layer.hooks.afterRender.call();
-      });
-    }
-  }, {
-    key: "pickRender",
-    value: function pickRender(layers, target) {
-      var _this3 = this;
-
       // Tip: 在进行拾取渲染的时候也需要先渲染一遍父组件然后再渲染子组件
       //  如需要在 栅格瓦片存在 Mask 的时候发生的拾取，那么就需要先渲染父组件（渲染父组件的帧缓冲）
-      if (this.parent.type === 'RasterLayer') {
-        this.renderMask(this.parent);
-      }
-
+      this.tileRenderService.renderMask(this.parent);
       var isPicked = layers.filter(function (layer) {
-        return _this3.parent.needPick(target.type) && layer.inited && layer.isVisible();
+        return _this2.parent.needPick(target.type) && layer.inited && layer.isVisible();
       }).some(function (layer) {
         layer.hooks.beforePickingEncode.call();
 
         if (layer.masks.length > 0) {
           // 清除上一次的模版缓存
-          _this3.rendererService.clear({
+          _this2.rendererService.clear({
             stencil: 0,
             depth: 1,
             framebuffer: null
@@ -105,17 +64,17 @@ var TilePickManager = /*#__PURE__*/function (_EventEmitter) {
         layer.renderModels(true);
         layer.hooks.afterPickingEncode.call();
 
-        var layerPicked = _this3.pickingService.pickFromPickingFBO(layer, target); // RasterLayer 不参与拾取后的 shader 计算
+        var layerPicked = _this2.pickingService.pickFromPickingFBO(layer, target); // RasterLayer 不参与拾取后的 shader 计算
 
 
-        if (layerPicked && _this3.parent.type !== 'RasterLayer') {
-          _this3.emit('pick', {
+        if (layerPicked && _this2.parent.type !== 'RasterLayer') {
+          _this2.emit('pick', {
             type: target.type,
-            pickedColors: _this3.pickingService.pickedColors,
+            pickedColors: _this2.pickingService.pickedColors,
             layer: layer
           });
 
-          _this3.pickingService.pickedTileLayers = [_this3.parent];
+          _this2.pickingService.pickedTileLayers = [_this2.parent];
         }
 
         return layerPicked;
@@ -159,28 +118,6 @@ var TilePickManager = /*#__PURE__*/function (_EventEmitter) {
         layer.hooks.beforeSelect.call(pickedColors);
       });
     }
-  }, {
-    key: "renderMask",
-    value: function renderMask(layer) {
-      if (layer.inited && layer.isVisible()) {
-        layer.hooks.beforeRender.call();
-
-        if (layer.masks.length > 0) {
-          this.rendererService.clear({
-            stencil: 0,
-            depth: 1,
-            framebuffer: null
-          });
-          layer.masks.map(function (m) {
-            m.hooks.beforeRender.call();
-            m.render();
-            m.hooks.afterRender.call();
-          });
-        }
-
-        layer.hooks.afterRender.call();
-      }
-    }
   }, {
     key: "destroy",
     value: function destroy() {
@@ -188,7 +125,5 @@ var TilePickManager = /*#__PURE__*/function (_EventEmitter) {
     }
   }]);
 
-  return TilePickManager;
-}(EventEmitter);
-
-export { TilePickManager as default };
+  return TilePickService;
+}(EventEmitter);

package/es/tile/interaction/getRasterData.d.ts

@@ -0,0 +1,4 @@
+import { IMapService, IRendererService } from '@antv/l7-core';
+import { Tile } from '@antv/l7-utils';
+export declare function readRasterValue(tile: Tile, mapService: IMapService, x: number, y: number): any;
+export declare function readPixel(x: number, y: number, rendererService: IRendererService): false | Uint8Array;