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

package/lib/line/index.js

@@ -88,19 +88,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/lib/line/models/great_circle.js

@@ -250,7 +250,7 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
             type: _l7Core.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];
@@ -269,7 +269,7 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
             type: _l7Core.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]];
           }
         }
@@ -286,7 +286,7 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
             type: _l7Core.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/lib/mask/index.js

@@ -145,19 +145,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/lib/plugins/DataMappingPlugin.js

@@ -57,7 +57,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
             styleAttributeService: styleAttributeService
           });
         } else {
-          source.once('sourceUpdate', function () {
+          source.once('update', function () {
             _this.generateMaping(layer, {
               styleAttributeService: styleAttributeService
             });
@@ -73,7 +73,7 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
             styleAttributeService: styleAttributeService
           });
         } else {
-          source.once('sourceUpdate', function () {
+          source.once('update', function () {
             _this.generateMaping(layer, {
               styleAttributeService: styleAttributeService
             });

package/lib/plugins/DataSourcePlugin.js

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

package/lib/plugins/FeatureScalePlugin.js

@@ -57,7 +57,7 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
       if (source.inited) {
         callback(source.data);
       } else {
-        source.once('sourceUpdate', function () {
+        source.once('update', function () {
           callback(source.data);
         });
       }
@@ -144,7 +144,8 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
       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
 
@@ -262,7 +263,8 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
         }
 
         return styleScale;
-      }
+      } // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+
 
       var firstValue = (_find = data.find(function (d) {
         return !(0, _lodash.isNil)(d[field]);

package/lib/plugins/LayerModelPlugin.js

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

package/lib/plugins/LightingPlugin.js

@@ -72,7 +72,7 @@ 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 = (0, _objectWithoutProperties2.default)(_ref, _excluded);

package/lib/plugins/RegisterStyleAttributePlugin.js

@@ -17,6 +17,8 @@ var _inversify = require("inversify");
 
 require("reflect-metadata");
 
+var _utils = require("../tile/utils");
+
 var _dec, _class;
 
 var RegisterStyleAttributePlugin = (
@@ -35,32 +37,26 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
 
       var styleAttributeService = _ref.styleAttributeService;
       layer.hooks.init.tap('RegisterStyleAttributePlugin', function () {
+        // 过滤 tileGroup layer （瓦片图层不需要注册）
+        if ((0, _utils.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/lib/plugins/UpdateStyleAttributePlugin.js

@@ -70,7 +70,7 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
       }).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/lib/point/index.js

@@ -130,19 +130,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/lib/point/models/earthFill.js

@@ -254,7 +254,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
             type: _l7Core.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];
@@ -274,7 +274,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
             type: _l7Core.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/lib/point/models/image.js

@@ -231,7 +231,7 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
             type: _l7Core.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/lib/polygon/index.js

@@ -70,19 +70,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/lib/polygon/models/ocean.js

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

package/lib/polygon/models/water.js

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

package/lib/raster/index.js

@@ -68,19 +68,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/lib/raster/models/raster.js

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

package/lib/raster/models/rasterRgb.js

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

package/lib/raster/models/rasterTile.js

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

package/lib/raster/raster.js

@@ -126,19 +126,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/lib/tile/{manager/tilePickerManager.js → interaction/TilePickService.js}

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.TilePickService = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
@@ -27,81 +27,41 @@ 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; } }
 
-var TilePickManager = /*#__PURE__*/function (_EventEmitter) {
-  (0, _inherits2.default)(TilePickManager, _EventEmitter);
+var TilePickService = /*#__PURE__*/function (_EventEmitter) {
+  (0, _inherits2.default)(TilePickService, _EventEmitter);
 
-  var _super = _createSuper(TilePickManager);
+  var _super = _createSuper(TilePickService);
 
-  function TilePickManager(parent, rendererService, pickingService, children) {
+  function TilePickService(parent, rendererService, pickingService, children, tileRenderService) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, TilePickManager);
+    (0, _classCallCheck2.default)(this, TilePickService);
     _this = _super.call(this);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isLastPicked", false);
     _this.parent = parent;
     _this.rendererService = rendererService;
     _this.pickingService = pickingService;
     _this.children = children;
+    _this.tileRenderService = tileRenderService;
     return _this;
   }
-  /**
-   *
-   * @param layers
-   */
 
-
-  (0, _createClass2.default)(TilePickManager, [{
-    key: "normalRender",
-    value: function normalRender(layers) {
+  (0, _createClass2.default)(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
@@ -117,17 +77,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;
@@ -171,35 +131,13 @@ 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() {
       this.removeAllListeners();
     }
   }]);
-  return TilePickManager;
+  return TilePickService;
 }(_eventemitter.EventEmitter);
 
-exports.default = TilePickManager;
+exports.TilePickService = TilePickService;

package/lib/tile/interaction/getFeatureData.js

@@ -0,0 +1 @@
+"use strict";

package/lib/tile/interaction/getRasterData.js

@@ -0,0 +1,83 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.readPixel = readPixel;
+exports.readRasterValue = readRasterValue;
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _l7Utils = require("@antv/l7-utils");
+
+function readRasterValue(tile, mapService, x, y) {
+  var _tile$bboxPolygon, _tile$data, _tile$data2, _tile$data3;
+
+  var bbox = (tile === null || tile === void 0 ? void 0 : (_tile$bboxPolygon = tile.bboxPolygon) === null || _tile$bboxPolygon === void 0 ? void 0 : _tile$bboxPolygon.bbox) || [0, 0, 10, -10];
+
+  var _bbox = (0, _slicedToArray2.default)(bbox, 4),
+      _bbox$ = _bbox[0],
+      minLng = _bbox$ === void 0 ? 0 : _bbox$,
+      _bbox$2 = _bbox[1],
+      minLat = _bbox$2 === void 0 ? 0 : _bbox$2,
+      _bbox$3 = _bbox[2],
+      maxLng = _bbox$3 === void 0 ? 10 : _bbox$3,
+      _bbox$4 = _bbox[3],
+      maxLat = _bbox$4 === void 0 ? -10 : _bbox$4;
+
+  var tileXY = mapService.lngLatToContainer([minLng, minLat]);
+  var tileMaxXY = mapService.lngLatToContainer([maxLng, maxLat]);
+  var tilePixelWidth = tileMaxXY.x - tileXY.x;
+  var tilePixelHeight = tileXY.y - tileMaxXY.y;
+  var pos = [(x - tileXY.x) / tilePixelWidth, // x
+  (y - tileMaxXY.y) / tilePixelHeight // y
+  ];
+  var tileWidth = (tile === null || tile === void 0 ? void 0 : (_tile$data = tile.data) === null || _tile$data === void 0 ? void 0 : _tile$data.width) || 1;
+  var tileHeight = (tile === null || tile === void 0 ? void 0 : (_tile$data2 = tile.data) === null || _tile$data2 === void 0 ? void 0 : _tile$data2.height) || 1;
+  var indexX = Math.floor(pos[0] * tileWidth);
+  var indexY = Math.floor(pos[1] * tileHeight);
+  var index = Math.max(0, indexY - 1) * tileWidth + indexX;
+  var data = tile === null || tile === void 0 ? void 0 : (_tile$data3 = tile.data) === null || _tile$data3 === void 0 ? void 0 : _tile$data3.data[index];
+  return data;
+}
+
+function readPixel(x, y, rendererService) {
+  var readPixels = rendererService.readPixels,
+      getContainer = rendererService.getContainer;
+  var xInDevicePixel = x * _l7Utils.DOM.DPR;
+  var yInDevicePixel = y * _l7Utils.DOM.DPR;
+
+  var _getContainerSize = getContainerSize(getContainer()),
+      width = _getContainerSize.width,
+      height = _getContainerSize.height;
+
+  width *= _l7Utils.DOM.DPR;
+  height *= _l7Utils.DOM.DPR;
+
+  if (xInDevicePixel > width - 1 * _l7Utils.DOM.DPR || xInDevicePixel < 0 || yInDevicePixel > height - 1 * _l7Utils.DOM.DPR || yInDevicePixel < 0) {
+    return false;
+  }
+
+  var pickedColors = readPixels({
+    x: Math.floor(xInDevicePixel),
+    // 视口坐标系原点在左上，而 WebGL 在左下，需要翻转 Y 轴
+    y: Math.floor(height - (y + 1) * _l7Utils.DOM.DPR),
+    width: 1,
+    height: 1,
+    data: new Uint8Array(1 * 1 * 4)
+  });
+  return pickedColors;
+}
+
+function getContainerSize(container) {
+  if (container.getContext) {
+    return {
+      width: container.width / _l7Utils.DOM.DPR,
+      height: container.height / _l7Utils.DOM.DPR
+    };
+  } else {
+    return container.getBoundingClientRect();
+  }
+}