@antv/l7-layers 2.13.4 → 2.13.6

package/lib/plugins/LayerModelPlugin.js

@@ -15,6 +15,8 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
+var _l7Core = require("@antv/l7-core");
+
 var _inversify = require("inversify");
 
 require("reflect-metadata");
@@ -33,9 +35,9 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   }
 
   (0, _createClass2.default)(LayerModelPlugin, [{
-    key: "initLayerModel",
+    key: "build",
     value: function () {
-      var _initLayerModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer) {
+      var _build = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer) {
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -47,9 +49,6 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
                 return layer.buildModels();
 
               case 3:
-                layer.styleNeedUpdate = false;
-
-              case 4:
               case "end":
                 return _context.stop();
             }
@@ -57,36 +56,60 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
         }, _callee);
       }));
 
-      function initLayerModel(_x) {
-        return _initLayerModel.apply(this, arguments);
+      function build(_x) {
+        return _build.apply(this, arguments);
       }
 
-      return initLayerModel;
+      return build;
     }()
   }, {
-    key: "prepareLayerModel",
+    key: "initLayerModel",
     value: function () {
-      var _prepareLayerModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(layer) {
+      var _initLayerModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(layer) {
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                // 更新Model 配置项
-                layer.prepareBuildModel(); // clear layerModel resource
-                // 初始化 Model
+                _context2.next = 2;
+                return this.build(layer);
 
-                _context2.next = 3;
-                return layer.buildModels();
+              case 2:
+                layer.styleNeedUpdate = false;
 
               case 3:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2);
+        }, _callee2, this);
       }));
 
-      function prepareLayerModel(_x2) {
+      function initLayerModel(_x2) {
+        return _initLayerModel.apply(this, arguments);
+      }
+
+      return initLayerModel;
+    }()
+  }, {
+    key: "prepareLayerModel",
+    value: function () {
+      var _prepareLayerModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(layer) {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return this.build(layer);
+
+              case 2:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function prepareLayerModel(_x3) {
         return _prepareLayerModel.apply(this, arguments);
       }
 
@@ -97,69 +120,73 @@ _dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
     value: function apply(layer) {
       var _this = this;
 
-      layer.hooks.init.tapPromise('LayerModelPlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        return _regenerator.default.wrap(function _callee3$(_context3) {
+      layer.hooks.init.tapPromise('LayerModelPlugin', /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+        return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
                 if (!layer.getSource().isTile) {
-                  _context3.next = 4;
+                  _context4.next = 4;
                   break;
                 }
 
                 layer.prepareBuildModel();
                 layer.tileLayer = new _BaseLayer.default(layer);
-                return _context3.abrupt("return");
+                return _context4.abrupt("return");
 
               case 4:
-                _context3.next = 6;
+                layer.log(_l7Core.IDebugLog.BuildModelStart);
+                _context4.next = 7;
                 return _this.initLayerModel(layer);
 
-              case 6:
+              case 7:
+                layer.log(_l7Core.IDebugLog.BuildModelEnd);
+
+              case 8:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3);
+        }, _callee4);
       })));
       layer.hooks.beforeRenderData.tapPromise('LayerModelPlugin', /*#__PURE__*/function () {
-        var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(flag) {
-          return _regenerator.default.wrap(function _callee4$(_context4) {
+        var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(flag) {
+          return _regenerator.default.wrap(function _callee5$(_context5) {
             while (1) {
-              switch (_context4.prev = _context4.next) {
+              switch (_context5.prev = _context5.next) {
                 case 0:
                   if (flag) {
-                    _context4.next = 2;
+                    _context5.next = 2;
                     break;
                   }
 
-                  return _context4.abrupt("return", false);
+                  return _context5.abrupt("return", false);
 
                 case 2:
                   if (!layer.getSource().isTile) {
-                    _context4.next = 5;
+                    _context5.next = 5;
                     break;
                   }
 
                   layer.tileLayer = new _BaseLayer.default(layer);
-                  return _context4.abrupt("return", false);
+                  return _context5.abrupt("return", false);
 
                 case 5:
-                  _context4.next = 7;
+                  _context5.next = 7;
                   return _this.prepareLayerModel(layer);
 
                 case 7:
-                  return _context4.abrupt("return", true);
+                  return _context5.abrupt("return", true);
 
                 case 8:
                 case "end":
-                  return _context4.stop();
+                  return _context5.stop();
               }
             }
-          }, _callee4);
+          }, _callee5);
         }));
 
-        return function (_x3) {
+        return function (_x4) {
           return _ref2.apply(this, arguments);
         };
       }());

package/lib/point/models/fill.js

@@ -163,13 +163,9 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/point/models/fillmage.js

@@ -33,10 +33,10 @@ var _lodash = require("lodash");
 
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 
-var _triangulation = require("../../core/triangulation");
-
 var _interface = require("../../core/interface");
 
+var _triangulation = require("../../core/triangulation");
+
 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; } }
@@ -198,13 +198,9 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.iconService.on('imageUpdate', this.updateTexture);
                 this.updateTexture();
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -315,8 +311,8 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
             var shape = feature.shape;
 
             var _ref3 = iconMap[shape] || {
-              x: 0,
-              y: 0
+              x: -64,
+              y: -64
             },
                 x = _ref3.x,
                 y = _ref3.y;

package/lib/point/models/image.js

@@ -166,13 +166,9 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.iconService.on('imageUpdate', this.updateTexture);
                 this.updateTexture();
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -282,11 +278,12 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
             var shape = feature.shape;
 
             var _ref3 = iconMap[shape] || {
-              x: 0,
-              y: 0
+              x: -64,
+              y: -64
             },
                 x = _ref3.x,
-                y = _ref3.y;
+                y = _ref3.y; // 非画布区域，默认的图标改为透明
+
 
             return [x, y];
           }

package/lib/point/models/text.js

@@ -140,11 +140,6 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           stroke = _ref2$stroke === void 0 ? '#fff' : _ref2$stroke,
           _ref2$strokeWidth = _ref2.strokeWidth,
           strokeWidth = _ref2$strokeWidth === void 0 ? 0 : _ref2$strokeWidth,
-          _ref2$textAnchor = _ref2.textAnchor,
-          textAnchor = _ref2$textAnchor === void 0 ? 'center' : _ref2$textAnchor,
-          textOffset = _ref2.textOffset,
-          _ref2$textAllowOverla = _ref2.textAllowOverlap,
-          textAllowOverlap = _ref2$textAllowOverla === void 0 ? false : _ref2$textAllowOverla,
           _ref2$halo = _ref2.halo,
           halo = _ref2$halo === void 0 ? 0.5 : _ref2$halo,
           _ref2$gamma = _ref2.gamma,
@@ -161,11 +156,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
         this.textCount = Object.keys(mapping).length;
       }
 
-      this.preTextStyle = {
-        textAnchor: textAnchor,
-        textAllowOverlap: textAllowOverlap,
-        textOffset: textOffset
-      };
+      this.preTextStyle = this.getTextStyle();
 
       if (this.dataTextureTest && this.dataTextureNeedUpdate({
         opacity: opacity,
@@ -221,8 +212,6 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref3, _ref3$textAnchor, textAnchor, _ref3$textAllowOverla, textAllowOverlap, textOffset;
-
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -230,19 +219,10 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
                 // 绑定事件
                 this.bindEvent();
                 this.extent = this.textExtent();
-                _ref3 = this.layer.getLayerConfig(), _ref3$textAnchor = _ref3.textAnchor, textAnchor = _ref3$textAnchor === void 0 ? 'center' : _ref3$textAnchor, _ref3$textAllowOverla = _ref3.textAllowOverlap, textAllowOverlap = _ref3$textAllowOverla === void 0 ? true : _ref3$textAllowOverla, textOffset = _ref3.textOffset;
-                this.preTextStyle = {
-                  textAnchor: textAnchor,
-                  textAllowOverlap: textAllowOverlap,
-                  textOffset: textOffset
-                };
-                _context2.next = 6;
-                return this.buildModels();
-
-              case 6:
-                return _context2.abrupt("return", _context2.sent);
+                this.preTextStyle = this.getTextStyle();
+                return _context2.abrupt("return", this.buildModels());
 
-              case 7:
+              case 4:
               case "end":
                 return _context2.stop();
             }
@@ -260,13 +240,13 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var _ref4, _ref4$mask, mask, _ref4$maskInside, maskInside, _ref4$textAllowOverla, textAllowOverlap, model;
+        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, _ref3$textAllowOverla, textAllowOverlap, model;
 
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                _ref4 = this.layer.getLayerConfig(), _ref4$mask = _ref4.mask, mask = _ref4$mask === void 0 ? false : _ref4$mask, _ref4$maskInside = _ref4.maskInside, maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside, _ref4$textAllowOverla = _ref4.textAllowOverlap, textAllowOverlap = _ref4$textAllowOverla === void 0 ? false : _ref4$textAllowOverla; //  this.mapping(); 重复调用
+                _ref3 = this.layer.getLayerConfig(), _ref3$mask = _ref3.mask, mask = _ref3$mask === void 0 ? false : _ref3$mask, _ref3$maskInside = _ref3.maskInside, maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside, _ref3$textAllowOverla = _ref3.textAllowOverlap, textAllowOverlap = _ref3$textAllowOverla === void 0 ? false : _ref3$textAllowOverla; //  this.mapping(); 重复调用
 
                 this.initGlyph(); //
 
@@ -306,60 +286,65 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
       }
 
       return buildModels;
-    }()
+    }() // 需要更新的场景
+    // 1. 文本偏移量发生改变
+    // 2. 文本锚点发生改变
+    // 3. 文本允许重叠发生改变
+    // 4. 文本字体发生改变
+    // 5. 文本字体粗细发生改变
+
   }, {
     key: "needUpdate",
     value: function () {
       var _needUpdate = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
-        var _ref5, _ref5$textAllowOverla, textAllowOverlap, _ref5$textAnchor, textAnchor, textOffset, data, zoom, extent, flag;
+        var _ref4, _ref4$textAllowOverla, textAllowOverlap, _ref4$textAnchor, textAnchor, textOffset, padding, fontFamily, fontWeight, zoom, extent, flag;
 
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                _ref5 = this.layer.getLayerConfig(), _ref5$textAllowOverla = _ref5.textAllowOverlap, textAllowOverlap = _ref5$textAllowOverla === void 0 ? false : _ref5$textAllowOverla, _ref5$textAnchor = _ref5.textAnchor, textAnchor = _ref5$textAnchor === void 0 ? 'center' : _ref5$textAnchor, textOffset = _ref5.textOffset;
-                data = this.layer.getEncodedData();
+                _ref4 = this.getTextStyle(), _ref4$textAllowOverla = _ref4.textAllowOverlap, textAllowOverlap = _ref4$textAllowOverla === void 0 ? false : _ref4$textAllowOverla, _ref4$textAnchor = _ref4.textAnchor, textAnchor = _ref4$textAnchor === void 0 ? 'center' : _ref4$textAnchor, textOffset = _ref4.textOffset, padding = _ref4.padding, fontFamily = _ref4.fontFamily, fontWeight = _ref4.fontWeight;
 
-                if (!(JSON.stringify(textOffset) !== JSON.stringify(this.preTextStyle.textOffset) || textAnchor !== this.preTextStyle.textAnchor)) {
-                  _context4.next = 6;
+                if (!(!(0, _lodash.isEqual)(padding, this.preTextStyle.padding) || !(0, _lodash.isEqual)(textOffset, this.preTextStyle.textOffset) || !(0, _lodash.isEqual)(textAnchor, this.preTextStyle.textAnchor) || !(0, _lodash.isEqual)(fontFamily, this.preTextStyle.fontFamily) || !(0, _lodash.isEqual)(fontWeight, this.preTextStyle.fontWeight))) {
+                  _context4.next = 5;
                   break;
                 }
 
-                _context4.next = 5;
+                _context4.next = 4;
                 return this.mapping();
 
-              case 5:
+              case 4:
                 return _context4.abrupt("return", true);
 
-              case 6:
-                if (!(data.length < 5 || textAllowOverlap)) {
-                  _context4.next = 8;
+              case 5:
+                if (!textAllowOverlap) {
+                  _context4.next = 7;
                   break;
                 }
 
                 return _context4.abrupt("return", false);
 
-              case 8:
+              case 7:
                 // textAllowOverlap 发生改变
                 zoom = this.mapService.getZoom();
                 extent = this.mapService.getBounds();
                 flag = (0, _l7Utils.boundsContains)(this.extent, extent); // 文本不能压盖则进行过滤
 
-                if (!(Math.abs(this.currentZoom - zoom) > 1 || !flag || textAllowOverlap !== this.preTextStyle.textAllowOverlap)) {
-                  _context4.next = 15;
+                if (!(Math.abs(this.currentZoom - zoom) > 0.5 || !flag || textAllowOverlap !== this.preTextStyle.textAllowOverlap)) {
+                  _context4.next = 14;
                   break;
                 }
 
-                _context4.next = 14;
+                _context4.next = 13;
                 return this.reBuildModel();
 
-              case 14:
+              case 13:
                 return _context4.abrupt("return", true);
 
-              case 15:
+              case 14:
                 return _context4.abrupt("return", false);
 
-              case 16:
+              case 15:
               case "end":
                 return _context4.stop();
             }
@@ -479,11 +464,9 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initTextFont",
     value: function initTextFont() {
-      var _ref6 = this.layer.getLayerConfig(),
-          _ref6$fontWeight = _ref6.fontWeight,
-          fontWeight = _ref6$fontWeight === void 0 ? '400' : _ref6$fontWeight,
-          _ref6$fontFamily = _ref6.fontFamily,
-          fontFamily = _ref6$fontFamily === void 0 ? 'sans-serif' : _ref6$fontFamily;
+      var _this$getTextStyle = this.getTextStyle(),
+          fontWeight = _this$getTextStyle.fontWeight,
+          fontFamily = _this$getTextStyle.fontFamily;
 
       var data = this.layer.getEncodedData();
       var characterSet = [];
@@ -524,11 +507,9 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initIconFontTex",
     value: function initIconFontTex() {
-      var _ref7 = this.layer.getLayerConfig(),
-          _ref7$fontWeight = _ref7.fontWeight,
-          fontWeight = _ref7$fontWeight === void 0 ? '400' : _ref7$fontWeight,
-          _ref7$fontFamily = _ref7.fontFamily,
-          fontFamily = _ref7$fontFamily === void 0 ? 'sans-serif' : _ref7$fontFamily;
+      var _this$getTextStyle2 = this.getTextStyle(),
+          fontWeight = _this$getTextStyle2.fontWeight,
+          fontFamily = _this$getTextStyle2.fontFamily;
 
       var data = this.layer.getEncodedData();
       var characterSet = [];
@@ -548,6 +529,44 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
         iconfont: true
       });
     }
+  }, {
+    key: "getTextStyle",
+    value: function getTextStyle() {
+      var _ref5 = this.layer.getLayerConfig(),
+          _ref5$fontWeight = _ref5.fontWeight,
+          fontWeight = _ref5$fontWeight === void 0 ? '400' : _ref5$fontWeight,
+          _ref5$fontFamily = _ref5.fontFamily,
+          fontFamily = _ref5$fontFamily === void 0 ? 'sans-serif' : _ref5$fontFamily,
+          _ref5$textAllowOverla = _ref5.textAllowOverlap,
+          textAllowOverlap = _ref5$textAllowOverla === void 0 ? false : _ref5$textAllowOverla,
+          _ref5$padding = _ref5.padding,
+          padding = _ref5$padding === void 0 ? [0, 0] : _ref5$padding,
+          _ref5$textAnchor = _ref5.textAnchor,
+          textAnchor = _ref5$textAnchor === void 0 ? 'center' : _ref5$textAnchor,
+          _ref5$textOffset = _ref5.textOffset,
+          textOffset = _ref5$textOffset === void 0 ? [0, 0] : _ref5$textOffset,
+          _ref5$opacity = _ref5.opacity,
+          opacity = _ref5$opacity === void 0 ? 1 : _ref5$opacity,
+          _ref5$strokeOpacity = _ref5.strokeOpacity,
+          strokeOpacity = _ref5$strokeOpacity === void 0 ? 1 : _ref5$strokeOpacity,
+          _ref5$strokeWidth = _ref5.strokeWidth,
+          strokeWidth = _ref5$strokeWidth === void 0 ? 0 : _ref5$strokeWidth,
+          _ref5$stroke = _ref5.stroke,
+          stroke = _ref5$stroke === void 0 ? '#000' : _ref5$stroke;
+
+      return {
+        fontWeight: fontWeight,
+        fontFamily: fontFamily,
+        textAllowOverlap: textAllowOverlap,
+        padding: padding,
+        textAnchor: textAnchor,
+        textOffset: textOffset,
+        opacity: opacity,
+        strokeOpacity: strokeOpacity,
+        strokeWidth: strokeWidth,
+        stroke: stroke
+      };
+    }
     /**
      * 生成文字布局（对照文字纹理字典提取对应文字的位置很好信息）
      */
@@ -560,12 +579,12 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
       // 更新文字布局
       var mapping = this.fontService.mapping;
 
-      var _ref8 = this.layer.getLayerConfig(),
-          _ref8$spacing = _ref8.spacing,
-          spacing = _ref8$spacing === void 0 ? 2 : _ref8$spacing,
-          _ref8$textAnchor = _ref8.textAnchor,
-          textAnchor = _ref8$textAnchor === void 0 ? 'center' : _ref8$textAnchor,
-          textOffset = _ref8.textOffset;
+      var _ref6 = this.layer.getLayerConfig(),
+          _ref6$spacing = _ref6.spacing,
+          spacing = _ref6$spacing === void 0 ? 2 : _ref6$spacing,
+          _ref6$textAnchor = _ref6.textAnchor,
+          textAnchor = _ref6$textAnchor === void 0 ? 'center' : _ref6$textAnchor,
+          textOffset = _ref6.textOffset;
 
       var data = this.layer.getEncodedData();
       this.glyphInfo = data.map(function (feature) {
@@ -600,15 +619,14 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     value: function filterGlyphs() {
       var _this3 = this;
 
-      var _ref9 = this.layer.getLayerConfig(),
-          _ref9$padding = _ref9.padding,
-          padding = _ref9$padding === void 0 ? [0, 0] : _ref9$padding,
-          _ref9$textAllowOverla = _ref9.textAllowOverlap,
-          textAllowOverlap = _ref9$textAllowOverla === void 0 ? false : _ref9$textAllowOverla;
+      var _ref7 = this.layer.getLayerConfig(),
+          _ref7$padding = _ref7.padding,
+          padding = _ref7$padding === void 0 ? [0, 0] : _ref7$padding,
+          _ref7$textAllowOverla = _ref7.textAllowOverlap,
+          textAllowOverlap = _ref7$textAllowOverla === void 0 ? false : _ref7$textAllowOverla;
 
       if (textAllowOverlap) {
         // 如果允许文本覆盖
-        // this.layer.setEncodedData(this.glyphInfo);
         return;
       }
 
@@ -667,8 +685,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           iconfont = _this$layer$getLayerC2 === void 0 ? false : _this$layer$getLayerC2; // 1.生成文字纹理（或是生成 iconfont）
 
 
-      iconfont ? this.initIconFontTex() : this.initTextFont(); // this.initTextFont();
-      // 2.生成文字布局
+      iconfont ? this.initIconFontTex() : this.initTextFont(); // 2.生成文字布局
 
       this.generateGlyphLayout(iconfont);
     }
@@ -699,13 +716,13 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     key: "reBuildModel",
     value: function () {
       var _reBuildModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
-        var _ref10, _ref10$mask, mask, _ref10$maskInside, maskInside, model;
+        var _ref8, _ref8$mask, mask, _ref8$maskInside, maskInside, model;
 
         return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
-                _ref10 = this.layer.getLayerConfig(), _ref10$mask = _ref10.mask, mask = _ref10$mask === void 0 ? false : _ref10$mask, _ref10$maskInside = _ref10.maskInside, maskInside = _ref10$maskInside === void 0 ? true : _ref10$maskInside;
+                _ref8 = this.layer.getLayerConfig(), _ref8$mask = _ref8.mask, mask = _ref8$mask === void 0 ? false : _ref8$mask, _ref8$maskInside = _ref8.maskInside, maskInside = _ref8$maskInside === void 0 ? true : _ref8$maskInside;
                 this.filterGlyphs();
                 _context5.next = 4;
                 return this.layer.buildLayerModel({

package/lib/tile/tileFactory/VectorTile.js

@@ -23,12 +23,12 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
+var _mask = _interopRequireDefault(require("../../mask"));
+
 var _Tile2 = _interopRequireDefault(require("./Tile"));
 
 var _util = require("./util");
 
-var _mask = _interopRequireDefault(require("../../mask"));
-
 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; } }
@@ -117,7 +117,7 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 mask = new _mask.default({
-                  layerType: "MaskLayer"
+                  layerType: 'MaskLayer'
                 }).source({
                   type: 'FeatureCollection',
                   features: [this.sourceTile.bboxPolygon]
@@ -190,8 +190,8 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
     }
     /**
      * 在一个 Tile 中可能存在一个相同 ID 的 feature
-     * @param id 
-     * @returns 
+     * @param id
+     * @returns
      */
 
   }, {
@@ -203,6 +203,7 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
         return [];
       }
 
+      console.log(layer.getSource().data.dataArray, id);
       var res = layer.getSource().data.dataArray.filter(function (d) {
         return d._id === id;
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.13.4",
+  "version": "2.13.6",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-core": "2.13.4",
-    "@antv/l7-maps": "2.13.4",
-    "@antv/l7-source": "2.13.4",
-    "@antv/l7-utils": "2.13.4",
+    "@antv/l7-core": "2.13.6",
+    "@antv/l7-maps": "2.13.6",
+    "@antv/l7-source": "2.13.6",
+    "@antv/l7-utils": "2.13.6",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "cdbe33fc2bab9da5ec85cbad98d32aa957b9506b",
+  "gitHead": "dc11ec312f2078704e548ba540d3289e1f752441",
   "publishConfig": {
     "access": "public"
   }