@antv/l7-layers 2.10.3 → 2.10.4

package/lib/raster/models/raster.js

@@ -135,8 +135,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initModels",
     value: function () {
-      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, rampColorsData, rampColors, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, imageData, model;
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(callbackModel) {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, rampColorsData, rampColors, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, imageData;
 
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
@@ -169,8 +169,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   height: imageData.height,
                   flipY: false
                 });
-                _context2.next = 15;
-                return this.layer.buildLayerModel({
+                this.layer.buildLayerModel({
                   moduleName: 'rasterImageData',
                   vertexShader: rasterVert,
                   fragmentShader: rasterFrag,
@@ -180,13 +179,14 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                     enable: false
                   },
                   stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                }).then(function (model) {
+                  callbackModel([model]);
+                }).catch(function (err) {
+                  console.warn(err);
+                  callbackModel([]);
                 });
 
-              case 15:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 17:
+              case 14:
               case "end":
                 return _context2.stop();
             }
@@ -194,7 +194,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         }, _callee2, this);
       }));
 
-      function initModels() {
+      function initModels(_x2) {
         return _initModels.apply(this, arguments);
       }
 
@@ -202,32 +202,9 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }()
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.next = 2;
-                return this.initModels();
-
-              case 2:
-                return _context3.abrupt("return", _context3.sent);
-
-              case 3:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
+    value: function buildModels(callbackModel) {
+      this.initModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {

package/lib/raster/models/rasterRgb.js

@@ -141,8 +141,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initModels",
     value: function () {
-      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(callbackModel) {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height;
 
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
@@ -168,8 +168,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   format: _l7Core.gl.RGB,
                   type: _l7Core.gl.FLOAT
                 });
-                _context2.next = 13;
-                return this.layer.buildLayerModel({
+                this.layer.buildLayerModel({
                   moduleName: 'rasterImageDataRGBA',
                   vertexShader: rasterVert,
                   fragmentShader: rasterFrag,
@@ -179,13 +178,14 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                     enable: false
                   },
                   stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                }).then(function (model) {
+                  callbackModel([model]);
+                }).catch(function (err) {
+                  console.warn(err);
+                  callbackModel([]);
                 });
 
-              case 13:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 15:
+              case 12:
               case "end":
                 return _context2.stop();
             }
@@ -193,7 +193,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         }, _callee2, this);
       }));
 
-      function initModels() {
+      function initModels(_x2) {
         return _initModels.apply(this, arguments);
       }
 
@@ -201,32 +201,9 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }()
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.next = 2;
-                return this.initModels();
-
-              case 2:
-                return _context3.abrupt("return", _context3.sent);
-
-              case 3:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
+    value: function buildModels(callbackModel) {
+      this.initModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {

package/lib/raster/models/rasterTile.js

@@ -7,10 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -85,83 +81,44 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, model;
-
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-                source = this.layer.getSource();
-                createTexture2D = this.rendererService.createTexture2D;
-                parserDataItem = source.data.dataArray[0];
-                this.texture = createTexture2D({
-                  data: parserDataItem.data,
-                  width: parserDataItem.width,
-                  height: parserDataItem.height,
-                  format: _l7Core.gl.LUMINANCE,
-                  type: _l7Core.gl.FLOAT
-                });
-                _context.next = 7;
-                return this.layer.buildLayerModel({
-                  moduleName: 'rasterTileImageData',
-                  vertexShader: rasterVert,
-                  fragmentShader: rasterFrag,
-                  triangulation: _triangulation.RasterImageTriangulation,
-                  depth: {
-                    enable: false
-                  },
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
-                });
-
-              case 7:
-                model = _context.sent;
-                return _context.abrupt("return", [model]);
-
-              case 9:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-
-      return initModels;
-    }()
+    value: function initModels(callbackModel) {
+      var _ref2 = this.layer.getLayerConfig(),
+          _ref2$mask = _ref2.mask,
+          mask = _ref2$mask === void 0 ? false : _ref2$mask,
+          _ref2$maskInside = _ref2.maskInside,
+          maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
+
+      var source = this.layer.getSource();
+      var createTexture2D = this.rendererService.createTexture2D;
+      var parserDataItem = source.data.dataArray[0];
+      this.texture = createTexture2D({
+        data: parserDataItem.data,
+        width: parserDataItem.width,
+        height: parserDataItem.height,
+        format: _l7Core.gl.LUMINANCE,
+        type: _l7Core.gl.FLOAT
+      });
+      this.layer.buildLayerModel({
+        moduleName: 'rasterTileImageData',
+        vertexShader: rasterVert,
+        fragmentShader: rasterFrag,
+        triangulation: _triangulation.RasterImageTriangulation,
+        depth: {
+          enable: false
+        },
+        stencil: (0, _l7Utils.getMask)(mask, maskInside)
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return this.initModels();
-
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
+    value: function buildModels(callbackModel) {
+      this.initModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {

package/lib/raster/raster.js

@@ -7,14 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -73,48 +69,30 @@ var RasterLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var parserDataItem, createTexture2D, _this$getLayerConfig, rampColors, imageData;
-
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                parserDataItem = this.getSource().data.dataArray[0];
-                createTexture2D = this.rendererService.createTexture2D;
-                this.rasterTexture = createTexture2D({
-                  data: parserDataItem.data,
-                  width: parserDataItem.width,
-                  height: parserDataItem.height,
-                  format: _l7Core.gl.LUMINANCE,
-                  type: _l7Core.gl.FLOAT,
-                  aniso: 4
-                });
-                _this$getLayerConfig = this.getLayerConfig(), rampColors = _this$getLayerConfig.rampColors;
-                imageData = (0, _l7Utils.generateColorRamp)(rampColors);
-                this.colorTexture = createTexture2D({
-                  data: imageData.data,
-                  width: imageData.width,
-                  height: imageData.height,
-                  flipY: false
-                });
-                this.models = [this.buildRasterModel()];
-
-              case 7:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
+    value: function buildModels() {
+      var parserDataItem = this.getSource().data.dataArray[0];
+      var createTexture2D = this.rendererService.createTexture2D;
+      this.rasterTexture = createTexture2D({
+        data: parserDataItem.data,
+        width: parserDataItem.width,
+        height: parserDataItem.height,
+        format: _l7Core.gl.LUMINANCE,
+        type: _l7Core.gl.FLOAT,
+        aniso: 4
+      });
 
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
+      var _this$getLayerConfig = this.getLayerConfig(),
+          rampColors = _this$getLayerConfig.rampColors;
 
-      return buildModels;
-    }()
+      var imageData = (0, _l7Utils.generateColorRamp)(rampColors);
+      this.colorTexture = createTexture2D({
+        data: imageData.data,
+        width: imageData.width,
+        height: imageData.height,
+        flipY: false
+      });
+      this.models = [this.buildRasterModel()];
+    }
   }, {
     key: "renderModels",
     value: function renderModels() {

package/lib/tile/interaction/TilePickService.js

@@ -0,0 +1,143 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TilePickService = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _eventemitter = require("eventemitter3");
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
+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 TilePickService = /*#__PURE__*/function (_EventEmitter) {
+  (0, _inherits2.default)(TilePickService, _EventEmitter);
+
+  var _super = _createSuper(TilePickService);
+
+  function TilePickService(parent, rendererService, pickingService, children, tileRenderService) {
+    var _this;
+
+    (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;
+  }
+
+  (0, _createClass2.default)(TilePickService, [{
+    key: "pick",
+    value: function pick(layers, target) {
+      var _this2 = this;
+
+      // Tip: 在进行拾取渲染的时候也需要先渲染一遍父组件然后再渲染子组件
+      //  如需要在 栅格瓦片存在 Mask 的时候发生的拾取，那么就需要先渲染父组件（渲染父组件的帧缓冲）
+      this.tileRenderService.renderMask(this.parent);
+      var isPicked = layers.filter(function (layer) {
+        return _this2.parent.needPick(target.type) && layer.inited && layer.isVisible();
+      }).some(function (layer) {
+        layer.hooks.beforePickingEncode.call();
+
+        if (layer.masks.length > 0) {
+          // 清除上一次的模版缓存
+          _this2.rendererService.clear({
+            stencil: 0,
+            depth: 1,
+            framebuffer: null
+          });
+
+          layer.masks.map(function (m) {
+            m.hooks.beforeRender.call();
+            m.render();
+            m.hooks.afterRender.call();
+          });
+        }
+
+        layer.renderModels(true);
+        layer.hooks.afterPickingEncode.call();
+
+        var layerPicked = _this2.pickingService.pickFromPickingFBO(layer, target); // RasterLayer 不参与拾取后的 shader 计算
+
+
+        if (layerPicked && _this2.parent.type !== 'RasterLayer') {
+          _this2.emit('pick', {
+            type: target.type,
+            pickedColors: _this2.pickingService.pickedColors,
+            layer: layer
+          });
+
+          _this2.pickingService.pickedTileLayers = [_this2.parent];
+        }
+
+        return layerPicked;
+      });
+
+      if (this.parent.type !== 'RasterLayer' && !isPicked && this.isLastPicked && target.type !== 'click') {
+        // 只有上一次有被高亮选中，本次未选中的时候才需要清除选中状态
+        this.pickingService.pickedTileLayers = [];
+        this.emit('unpick', {});
+        this.beforeHighlight([0, 0, 0]);
+      }
+
+      this.isLastPicked = isPicked;
+      return isPicked;
+    }
+  }, {
+    key: "clearPick",
+    value: function clearPick() {
+      this.children.filter(function (child) {
+        return child.inited && child.isVisible();
+      }).map(function (layer) {
+        layer.hooks.beforeSelect.call([0, 0, 0]);
+      });
+      this.pickingService.pickedTileLayers = [];
+    }
+  }, {
+    key: "beforeHighlight",
+    value: function beforeHighlight(pickedColors) {
+      this.children.filter(function (child) {
+        return child.inited && child.isVisible();
+      }).map(function (child) {
+        child.hooks.beforeHighlight.call(pickedColors);
+      });
+    }
+  }, {
+    key: "beforeSelect",
+    value: function beforeSelect(pickedColors) {
+      this.children.filter(function (child) {
+        return child.inited && child.isVisible();
+      }).map(function (layer) {
+        layer.hooks.beforeSelect.call(pickedColors);
+      });
+    }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      this.removeAllListeners();
+    }
+  }]);
+  return TilePickService;
+}(_eventemitter.EventEmitter);
+
+exports.TilePickService = TilePickService;

package/lib/tile/interaction/utils.js

@@ -45,7 +45,7 @@ function setSelect(layers, pickedColors, renderList) {
   }); // unselect normal layer
 
   renderList.filter(function (layer) {
-    return layer.inited && layer.isVisible() && layer.needPick('click');
+    return layer.inited && !layer.isVector && layer.isVisible() && layer.needPick('click');
   }).filter(function (layer) {
     return layer.getCurrentSelectedId() !== null;
   }).map(function (layer) {
@@ -58,8 +58,9 @@ function setSelect(layers, pickedColors, renderList) {
 function setHighlight(layers, pickedColors) {
   var pickId = (0, _l7Utils.decodePickingColor)(pickedColors);
   layers.filter(function (layer) {
-    return layer.inited && layer.isVisible();
-  }) // @ts-ignore
+    return layer.inited && layer.isVisible() && layer.isVector;
+  }) // Tip: 使用 vectorLayer 上的 pickID 优化高亮操作（过滤重复操作）
+  // @ts-ignore
   .filter(function (layer) {
     return layer.getPickID() !== pickId;
   }).map(function (layer) {
@@ -72,6 +73,13 @@ function setHighlight(layers, pickedColors) {
 function setPickState(layers, pickColors) {
   if (pickColors.select) {
     layers.map(function (layer) {
+      // if(layer.modelLoaded) {
+      //   selectFeature(layer, this.pickColors.select);
+      // } else {
+      //   layer.once('modelLoaded', () => {
+      //     selectFeature(layer, this.pickColors.select);
+      //   })
+      // }
       selectFeature(layer, pickColors.select);
     });
   }