@antv/l7-layers 2.21.1 → 2.21.2

package/lib/point/models/text.js

@@ -6,39 +6,28 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TextTrianglation = TextTrianglation;
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-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 _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
-var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _collisionIndex = _interopRequireDefault(require("../../utils/collision-index"));
 var _symbolLayout = require("../../utils/symbol-layout");
 var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-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; } }
 /* babel-plugin-inline-import '../shaders/text/text_frag.glsl' */
-var textFrag = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 48.0\n\nuniform sampler2D u_sdf_map;\nlayout(std140) uniform commonUniforms {\n  vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n  vec2 u_sdf_map_size;\n  float u_raisingHeight: 0.0;\n  float u_stroke_width : 2;\n  float u_gamma_scale : 0.5;\n  float u_halo_blur : 0.5;\n};\n\nin vec2 v_uv;\nin float v_gamma_scale;\nin vec4 v_color;\nin vec4 v_stroke_color;\nin float v_fontScale;\n\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  // get style data mapping\n\n  // get sdf from atlas\n  float dist = texture(SAMPLER_2D(u_sdf_map), v_uv).a;\n\n  lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;\n  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;\n\n  highp float gamma_scaled = gamma * v_gamma_scale;\n\n  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);\n\n  outputColor = mix(v_color, v_stroke_color, smoothstep(0., 0.5, 1.- dist));\n\n  outputColor.a *= alpha;\n   // \u4F5C\u4E3A mask \u6A21\u677F\u65F6\u9700\u8981\u4E22\u5F03\u900F\u660E\u7684\u50CF\u7D20\n  if (outputColor.a < 0.01) {\n    discard;\n  }\n  outputColor = filterColor(outputColor);\n}\n";
+const textFrag = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 48.0\n\nuniform sampler2D u_sdf_map;\nlayout(std140) uniform commonUniforms {\n  vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n  vec2 u_sdf_map_size;\n  float u_raisingHeight: 0.0;\n  float u_stroke_width : 2;\n  float u_gamma_scale : 0.5;\n  float u_halo_blur : 0.5;\n};\n\nin vec2 v_uv;\nin float v_gamma_scale;\nin vec4 v_color;\nin vec4 v_stroke_color;\nin float v_fontScale;\n\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  // get style data mapping\n\n  // get sdf from atlas\n  float dist = texture(SAMPLER_2D(u_sdf_map), v_uv).a;\n\n  lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;\n  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;\n\n  highp float gamma_scaled = gamma * v_gamma_scale;\n\n  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);\n\n  outputColor = mix(v_color, v_stroke_color, smoothstep(0., 0.5, 1.- dist));\n\n  outputColor.a *= alpha;\n   // \u4F5C\u4E3A mask \u6A21\u677F\u65F6\u9700\u8981\u4E22\u5F03\u900F\u660E\u7684\u50CF\u7D20\n  if (outputColor.a < 0.01) {\n    discard;\n  }\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/text/text_vert.glsl' */
-var textVert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\n\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\nlayout(location = 10) in vec2 a_textOffsets;\nlayout(location = 14) in vec2 a_tex;\n\nlayout(std140) uniform commonUniforms {\n  vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n  vec2 u_sdf_map_size;\n  float u_raisingHeight: 0.0;\n  float u_stroke_width : 2;\n  float u_gamma_scale : 0.5;\n  float u_halo_blur : 0.5;\n};\n\nout vec2 v_uv;\nout float v_gamma_scale;\nout vec4 v_color;\nout vec4 v_stroke_color;\nout float v_fontScale;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  \n  v_uv = a_tex / u_sdf_map_size;\n\n\n\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  v_stroke_color = vec4(u_stroke_color.xyz, u_stroke_color.w * opacity);\n\n  // \u6587\u672C\u7F29\u653E\u6BD4\u4F8B\n  float fontScale = a_Size / FONT_SIZE;\n  v_fontScale = fontScale;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // vec4 projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  vec2 offset = rotate_matrix(a_textOffsets,rotation);\n  \n  // gl_Position = vec4(projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n\n  float raiseHeight = u_raisingHeight;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    raiseHeight = u_raisingHeight * mapboxZoomScale;\n  }\n\n  vec4 projected_position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + offset * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n  v_gamma_scale = gl_Position.w;\n  setPickingColor(a_PickingColor);\n\n}\n";
-var isEqual = _l7Utils.lodashUtil.isEqual;
+const textVert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\n\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\nlayout(location = 10) in vec2 a_textOffsets;\nlayout(location = 14) in vec2 a_tex;\n\nlayout(std140) uniform commonUniforms {\n  vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n  vec2 u_sdf_map_size;\n  float u_raisingHeight: 0.0;\n  float u_stroke_width : 2;\n  float u_gamma_scale : 0.5;\n  float u_halo_blur : 0.5;\n};\n\nout vec2 v_uv;\nout float v_gamma_scale;\nout vec4 v_color;\nout vec4 v_stroke_color;\nout float v_fontScale;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  \n  v_uv = a_tex / u_sdf_map_size;\n\n\n\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  v_stroke_color = vec4(u_stroke_color.xyz, u_stroke_color.w * opacity);\n\n  // \u6587\u672C\u7F29\u653E\u6BD4\u4F8B\n  float fontScale = a_Size / FONT_SIZE;\n  v_fontScale = fontScale;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // vec4 projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  vec2 offset = rotate_matrix(a_textOffsets,rotation);\n  \n  // gl_Position = vec4(projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n\n  float raiseHeight = u_raisingHeight;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    raiseHeight = u_raisingHeight * mapboxZoomScale;\n  }\n\n  vec4 projected_position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + offset * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n  v_gamma_scale = gl_Position.w;\n  setPickingColor(a_PickingColor);\n\n}\n";
+const {
+  isEqual
+} = _l7Utils.lodashUtil;
 function TextTrianglation(feature) {
   // @ts-ignore
-  var that = this;
-  var id = feature.id;
-  var vertices = [];
-  var indices = [];
+  const that = this;
+  const id = feature.id;
+  const vertices = [];
+  const indices = [];
   if (!that.glyphInfoMap || !that.glyphInfoMap[id]) {
     return {
       vertices: [],
@@ -47,588 +36,470 @@ function TextTrianglation(feature) {
       size: 7
     };
   }
-  var centroid = that.glyphInfoMap[id].centroid; // 计算中心点
-  var coord = centroid.length === 2 ? [centroid[0], centroid[1], 0] : centroid;
-  that.glyphInfoMap[id].glyphQuads.forEach(function (quad, index) {
-    vertices.push.apply(vertices, (0, _toConsumableArray2.default)(coord).concat([quad.tex.x, quad.tex.y + quad.tex.height, quad.tl.x, quad.tl.y], (0, _toConsumableArray2.default)(coord), [quad.tex.x + quad.tex.width, quad.tex.y + quad.tex.height, quad.tr.x, quad.tr.y], (0, _toConsumableArray2.default)(coord), [quad.tex.x + quad.tex.width, quad.tex.y, quad.br.x, quad.br.y], (0, _toConsumableArray2.default)(coord), [quad.tex.x, quad.tex.y, quad.bl.x, quad.bl.y]));
+  const centroid = that.glyphInfoMap[id].centroid; // 计算中心点
+  const coord = centroid.length === 2 ? [centroid[0], centroid[1], 0] : centroid;
+  that.glyphInfoMap[id].glyphQuads.forEach((quad, index) => {
+    vertices.push(...coord, quad.tex.x, quad.tex.y + quad.tex.height, quad.tl.x, quad.tl.y, ...coord, quad.tex.x + quad.tex.width, quad.tex.y + quad.tex.height, quad.tr.x, quad.tr.y, ...coord, quad.tex.x + quad.tex.width, quad.tex.y, quad.br.x, quad.br.y, ...coord, quad.tex.x, quad.tex.y, quad.bl.x, quad.bl.y);
     indices.push(0 + index * 4, 1 + index * 4, 2 + index * 4, 2 + index * 4, 3 + index * 4, 0 + index * 4);
   });
   return {
-    vertices: vertices,
+    vertices,
     // [ x, y, z, tex.x,tex.y, offset.x. offset.y]
-    indices: indices,
+    indices,
     size: 7
   };
 }
-var TextModel = exports.default = /*#__PURE__*/function (_BaseModel) {
-  (0, _inherits2.default)(TextModel, _BaseModel);
-  var _super = _createSuper(TextModel);
-  function TextModel() {
+class TextModel extends _BaseModel.default {
+  constructor(...args) {
     var _this;
-    (0, _classCallCheck2.default)(this, TextModel);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "glyphInfoMap", {});
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "currentZoom", -1);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "textureHeight", 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "textCount", 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "preTextStyle", {});
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mapping", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _this.initGlyph(); //
-            _this.updateTexture();
-            _context.next = 4;
-            return _this.reBuildModel();
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    })));
-    return _this;
+    super(...args);
+    _this = this;
+    (0, _defineProperty2.default)(this, "glyphInfo", void 0);
+    (0, _defineProperty2.default)(this, "glyphInfoMap", {});
+    (0, _defineProperty2.default)(this, "rawEncodeData", void 0);
+    (0, _defineProperty2.default)(this, "texture", void 0);
+    (0, _defineProperty2.default)(this, "currentZoom", -1);
+    (0, _defineProperty2.default)(this, "extent", void 0);
+    (0, _defineProperty2.default)(this, "textureHeight", 0);
+    (0, _defineProperty2.default)(this, "textCount", 0);
+    (0, _defineProperty2.default)(this, "preTextStyle", {});
+    (0, _defineProperty2.default)(this, "mapping", /*#__PURE__*/(0, _asyncToGenerator2.default)(function* () {
+      _this.initGlyph(); //
+      _this.updateTexture();
+      yield _this.reBuildModel();
+    }));
   }
-  (0, _createClass2.default)(TextModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
-      var commoninfo = this.getCommonUniformsInfo();
-      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
-      this.updateStyleUnifoms();
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, commoninfo.uniformsOption), attributeInfo.uniformsOption), {
-        u_sdf_map: this.textures[0]
-      });
+  getUninforms() {
+    const commoninfo = this.getCommonUniformsInfo();
+    const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+    this.updateStyleUnifoms();
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, commoninfo.uniformsOption), attributeInfo.uniformsOption), {
+      u_sdf_map: this.textures[0]
+    });
+  }
+  getCommonUniformsInfo() {
+    const {
+      stroke = '#fff',
+      strokeWidth = 0,
+      halo = 0.5,
+      gamma = 2.0,
+      raisingHeight = 0
+    } = this.layer.getLayerConfig();
+    const mapping = this.getFontServiceMapping();
+    const canvas = this.getFontServiceCanvas();
+    if (mapping && Object.keys(mapping).length !== this.textCount && canvas) {
+      this.updateTexture();
+      this.textCount = Object.keys(mapping).length;
     }
-  }, {
-    key: "getCommonUniformsInfo",
-    value: function getCommonUniformsInfo() {
-      var _ref2 = this.layer.getLayerConfig(),
-        _ref2$stroke = _ref2.stroke,
-        stroke = _ref2$stroke === void 0 ? '#fff' : _ref2$stroke,
-        _ref2$strokeWidth = _ref2.strokeWidth,
-        strokeWidth = _ref2$strokeWidth === void 0 ? 0 : _ref2$strokeWidth,
-        _ref2$halo = _ref2.halo,
-        halo = _ref2$halo === void 0 ? 0.5 : _ref2$halo,
-        _ref2$gamma = _ref2.gamma,
-        gamma = _ref2$gamma === void 0 ? 2.0 : _ref2$gamma,
-        _ref2$raisingHeight = _ref2.raisingHeight,
-        raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight;
-      var mapping = this.getFontServiceMapping();
-      var canvas = this.getFontServiceCanvas();
-      if (mapping && Object.keys(mapping).length !== this.textCount && canvas) {
-        this.updateTexture();
-        this.textCount = Object.keys(mapping).length;
+    this.preTextStyle = this.getTextStyle();
+    const commonOptions = {
+      u_stroke_color: (0, _l7Utils.rgb2arr)(stroke),
+      u_sdf_map_size: [(canvas === null || canvas === void 0 ? void 0 : canvas.width) || 1, (canvas === null || canvas === void 0 ? void 0 : canvas.height) || 1],
+      u_raisingHeight: Number(raisingHeight),
+      u_stroke_width: strokeWidth,
+      u_gamma_scale: gamma,
+      u_halo_blur: halo
+    };
+    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+    return commonBufferInfo;
+  }
+  initModels() {
+    var _this2 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      // 绑定事件
+      _this2.bindEvent();
+      _this2.extent = _this2.textExtent();
+      _this2.rawEncodeData = _this2.layer.getEncodedData();
+      _this2.preTextStyle = _this2.getTextStyle();
+      _this2.initUniformsBuffer();
+      return _this2.buildModels();
+    })();
+  }
+  buildModels() {
+    var _this3 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      const {
+        textAllowOverlap = false
+      } = _this3.layer.getLayerConfig();
+
+      //  this.mapping(); 重复调用
+      _this3.initGlyph(); //
+      _this3.updateTexture();
+      if (!textAllowOverlap) {
+        _this3.filterGlyphs();
       }
-      this.preTextStyle = this.getTextStyle();
-      var commonOptions = {
-        u_stroke_color: (0, _l7Utils.rgb2arr)(stroke),
-        u_sdf_map_size: [(canvas === null || canvas === void 0 ? void 0 : canvas.width) || 1, (canvas === null || canvas === void 0 ? void 0 : canvas.height) || 1],
-        u_raisingHeight: Number(raisingHeight),
-        u_stroke_width: strokeWidth,
-        u_gamma_scale: gamma,
-        u_halo_blur: halo
-      };
-      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-      return commonBufferInfo;
-    }
-  }, {
-    key: "initModels",
-    value: function () {
-      var _initModels = (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:
-              // 绑定事件
-              this.bindEvent();
-              this.extent = this.textExtent();
-              this.rawEncodeData = this.layer.getEncodedData();
-              this.preTextStyle = this.getTextStyle();
-              this.initUniformsBuffer();
-              return _context2.abrupt("return", this.buildModels());
-            case 6:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function initModels() {
-        return _initModels.apply(this, arguments);
+      const model = yield _this3.layer.buildLayerModel({
+        moduleName: 'pointText',
+        vertexShader: textVert,
+        fragmentShader: textFrag,
+        inject: _this3.getInject(),
+        triangulation: TextTrianglation.bind(_this3),
+        depth: {
+          enable: false
+        }
+      });
+      return [model];
+    })();
+  }
+  // 需要更新的场景
+  // 1. 文本偏移量发生改变
+  // 2. 文本锚点发生改变
+  // 3. 文本允许重叠发生改变
+  // 4. 文本字体发生改变
+  // 5. 文本字体粗细发生改变
+  needUpdate() {
+    var _this4 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      const {
+        textAllowOverlap = false,
+        textAnchor = 'center',
+        textOffset,
+        padding,
+        fontFamily,
+        fontWeight
+      } = _this4.getTextStyle();
+      if (!isEqual(padding, _this4.preTextStyle.padding) || !isEqual(textOffset, _this4.preTextStyle.textOffset) || !isEqual(textAnchor, _this4.preTextStyle.textAnchor) || !isEqual(fontFamily, _this4.preTextStyle.fontFamily) || !isEqual(fontWeight, _this4.preTextStyle.fontWeight)) {
+        yield _this4.mapping();
+        return true;
       }
-      return initModels;
-    }()
-  }, {
-    key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var _ref3, _ref3$textAllowOverla, textAllowOverlap, model;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _ref3 = this.layer.getLayerConfig(), _ref3$textAllowOverla = _ref3.textAllowOverlap, textAllowOverlap = _ref3$textAllowOverla === void 0 ? false : _ref3$textAllowOverla; //  this.mapping(); 重复调用
-              this.initGlyph(); //
-              this.updateTexture();
-              if (!textAllowOverlap) {
-                this.filterGlyphs();
-              }
-              _context3.next = 6;
-              return this.layer.buildLayerModel({
-                moduleName: 'pointText',
-                vertexShader: textVert,
-                fragmentShader: textFrag,
-                inject: this.getInject(),
-                triangulation: TextTrianglation.bind(this),
-                depth: {
-                  enable: false
-                }
-              });
-            case 6:
-              model = _context3.sent;
-              return _context3.abrupt("return", [model]);
-            case 8:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
+      if (textAllowOverlap) {
+        // 小于不做避让
+        return false;
       }
-      return buildModels;
-    }() // 需要更新的场景
-    // 1. 文本偏移量发生改变
-    // 2. 文本锚点发生改变
-    // 3. 文本允许重叠发生改变
-    // 4. 文本字体发生改变
-    // 5. 文本字体粗细发生改变
-  }, {
-    key: "needUpdate",
-    value: function () {
-      var _needUpdate = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
-        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:
-              _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 (!(!isEqual(padding, this.preTextStyle.padding) || !isEqual(textOffset, this.preTextStyle.textOffset) || !isEqual(textAnchor, this.preTextStyle.textAnchor) || !isEqual(fontFamily, this.preTextStyle.fontFamily) || !isEqual(fontWeight, this.preTextStyle.fontWeight))) {
-                _context4.next = 5;
-                break;
-              }
-              _context4.next = 4;
-              return this.mapping();
-            case 4:
-              return _context4.abrupt("return", true);
-            case 5:
-              if (!textAllowOverlap) {
-                _context4.next = 7;
-                break;
-              }
-              return _context4.abrupt("return", false);
-            case 7:
-              // textAllowOverlap 发生改变
-              zoom = this.mapService.getZoom();
-              extent = this.mapService.getBounds();
-              flag = (0, _l7Utils.boundsContains)(this.extent, extent); // 文本不能压盖则进行过滤
-              if (!(Math.abs(this.currentZoom - zoom) > 0.5 || !flag || textAllowOverlap !== this.preTextStyle.textAllowOverlap)) {
-                _context4.next = 14;
-                break;
-              }
-              _context4.next = 13;
-              return this.reBuildModel();
-            case 13:
-              return _context4.abrupt("return", true);
-            case 14:
-              return _context4.abrupt("return", false);
-            case 15:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4, this);
-      }));
-      function needUpdate() {
-        return _needUpdate.apply(this, arguments);
+
+      // textAllowOverlap 发生改变
+      const zoom = _this4.mapService.getZoom();
+      const extent = _this4.mapService.getBounds();
+      const flag = (0, _l7Utils.boundsContains)(_this4.extent, extent);
+      // 文本不能压盖则进行过滤
+      if (Math.abs(_this4.currentZoom - zoom) > 0.5 || !flag || textAllowOverlap !== _this4.preTextStyle.textAllowOverlap) {
+        // TODO this.mapping 数据未变化，避让
+        yield _this4.reBuildModel();
+        return true;
       }
-      return needUpdate;
-    }()
-  }, {
-    key: "clearModels",
-    value: function clearModels() {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
-      // TODO this.mapping
-      this.layer.off('remapping', this.mapping);
-    }
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'textOffsets',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          shaderLocation: 10,
-          name: 'a_textOffsets',
-          // 文字偏移量
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: _l7Core.gl.STATIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 2,
-          update: function update(feature, featureIdx, vertex) {
-            return [vertex[5], vertex[6]];
-          }
+      return false;
+    })();
+  }
+  clearModels() {
+    var _this$texture;
+    (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+    // TODO this.mapping
+    this.layer.off('remapping', this.mapping);
+  }
+  registerBuiltinAttributes() {
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'textOffsets',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        shaderLocation: 10,
+        name: 'a_textOffsets',
+        // 文字偏移量
+        buffer: {
+          // give the WebGL driver a hint that this buffer may change
+          usage: _l7Core.gl.STATIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 2,
+        update: (feature, featureIdx, vertex) => {
+          return [vertex[5], vertex[6]];
         }
-      });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'textUv',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'a_tex',
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
-          buffer: {
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 2,
-          update: function update(feature, featureIdx, vertex) {
-            return [vertex[3], vertex[4]];
-          }
+      }
+    });
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'textUv',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_tex',
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
+        buffer: {
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 2,
+        update: (feature, featureIdx, vertex) => {
+          return [vertex[3], vertex[4]];
         }
-      });
-      // point layer size;
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'size',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Size',
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature) {
-            var _feature$size = feature.size,
-              size = _feature$size === void 0 ? 12 : _feature$size;
-            return Array.isArray(size) ? [size[0]] : [size];
-          }
+      }
+    });
+    // point layer size;
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'size',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Size',
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
+        buffer: {
+          // give the WebGL driver a hint that this buffer may change
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 1,
+        update: feature => {
+          const {
+            size = 12
+          } = feature;
+          return Array.isArray(size) ? [size[0]] : [size];
         }
-      });
-    }
-  }, {
-    key: "bindEvent",
-    value: function bindEvent() {
-      if (!this.layer.isTileLayer) {
-        // 重新绑定
-        this.layer.on('remapping', this.mapping);
       }
+    });
+  }
+  bindEvent() {
+    if (!this.layer.isTileLayer) {
+      // 重新绑定
+      this.layer.on('remapping', this.mapping);
     }
-  }, {
-    key: "textExtent",
-    value: function textExtent() {
-      var bounds = this.mapService.getBounds();
-      return (0, _l7Utils.padBounds)(bounds, 0.5);
-    }
-    /**
-     * 生成文字纹理（生成文字纹理字典）
-     */
-  }, {
-    key: "initTextFont",
-    value: function initTextFont() {
-      var _this$getTextStyle = this.getTextStyle(),
-        fontWeight = _this$getTextStyle.fontWeight,
-        fontFamily = _this$getTextStyle.fontFamily;
-      var data = this.rawEncodeData;
-      var characterSet = [];
-      data.forEach(function (item) {
-        var _item$shape = item.shape,
-          shape = _item$shape === void 0 ? '' : _item$shape;
-        shape = shape.toString();
-        var _iterator = _createForOfIteratorHelper(shape),
-          _step;
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var char = _step.value;
-            // 去重
-            if (characterSet.indexOf(char) === -1) {
-              characterSet.push(char);
-            }
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
+  }
+  textExtent() {
+    const bounds = this.mapService.getBounds();
+    return (0, _l7Utils.padBounds)(bounds, 0.5);
+  }
+  /**
+   * 生成文字纹理（生成文字纹理字典）
+   */
+  initTextFont() {
+    const {
+      fontWeight,
+      fontFamily
+    } = this.getTextStyle();
+    const data = this.rawEncodeData;
+    const characterSet = [];
+    data.forEach(item => {
+      let {
+        shape = ''
+      } = item;
+      shape = shape.toString();
+      for (const char of shape) {
+        // 去重
+        if (characterSet.indexOf(char) === -1) {
+          characterSet.push(char);
         }
-      });
-      this.fontService.setFontOptions({
-        characterSet: characterSet,
-        fontWeight: fontWeight,
-        fontFamily: fontFamily,
-        iconfont: false
-      });
-    }
+      }
+    });
+    this.fontService.setFontOptions({
+      characterSet,
+      fontWeight,
+      fontFamily,
+      iconfont: false
+    });
+  }
 
-    /**
-     * 生成 iconfont 纹理字典
-     */
-  }, {
-    key: "initIconFontTex",
-    value: function initIconFontTex() {
-      var _this$getTextStyle2 = this.getTextStyle(),
-        fontWeight = _this$getTextStyle2.fontWeight,
-        fontFamily = _this$getTextStyle2.fontFamily;
-      var data = this.rawEncodeData;
-      var characterSet = [];
-      data.forEach(function (item) {
-        var _item$shape2 = item.shape,
-          shape = _item$shape2 === void 0 ? '' : _item$shape2;
-        shape = "".concat(shape);
-        if (characterSet.indexOf(shape) === -1) {
-          characterSet.push(shape);
-        }
-      });
-      this.fontService.setFontOptions({
-        characterSet: characterSet,
-        fontWeight: fontWeight,
-        fontFamily: fontFamily,
-        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
-      };
-    }
+  /**
+   * 生成 iconfont 纹理字典
+   */
+  initIconFontTex() {
+    const {
+      fontWeight,
+      fontFamily
+    } = this.getTextStyle();
+    const data = this.rawEncodeData;
+    const characterSet = [];
+    data.forEach(item => {
+      let {
+        shape = ''
+      } = item;
+      shape = `${shape}`;
+      if (characterSet.indexOf(shape) === -1) {
+        characterSet.push(shape);
+      }
+    });
+    this.fontService.setFontOptions({
+      characterSet,
+      fontWeight,
+      fontFamily,
+      iconfont: true
+    });
+  }
+  getTextStyle() {
+    const {
+      fontWeight = '400',
+      fontFamily = 'sans-serif',
+      textAllowOverlap = false,
+      padding = [0, 0],
+      textAnchor = 'center',
+      textOffset = [0, 0],
+      opacity = 1,
+      strokeOpacity = 1,
+      strokeWidth = 0,
+      stroke = '#000'
+    } = this.layer.getLayerConfig();
+    return {
+      fontWeight,
+      fontFamily,
+      textAllowOverlap,
+      padding,
+      textAnchor,
+      textOffset,
+      opacity,
+      strokeOpacity,
+      strokeWidth,
+      stroke
+    };
+  }
 
-    /**
-     * 生成文字布局（对照文字纹理字典提取对应文字的位置很好信息）
-     */
-  }, {
-    key: "generateGlyphLayout",
-    value: function generateGlyphLayout(iconfont) {
-      var _this2 = this;
-      var mapping = this.getFontServiceMapping();
-      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.rawEncodeData;
-      this.glyphInfo = data.map(function (feature) {
-        var _feature$shape = feature.shape,
-          shape = _feature$shape === void 0 ? '' : _feature$shape,
-          id = feature.id,
-          _feature$size2 = feature.size,
-          size = _feature$size2 === void 0 ? 1 : _feature$size2;
-        var offset = feature.textOffset ? feature.textOffset : textOffset || [0, 0];
-        var anchor = feature.textAnchor ? feature.textAnchor : textAnchor || 'center';
-        var shaping = (0, _symbolLayout.shapeText)(shape.toString(), mapping,
-        // @ts-ignore
-        size, anchor, 'left', spacing, offset,
-        //
-        iconfont);
-        var glyphQuads = (0, _symbolLayout.getGlyphQuads)(shaping, offset, false);
-        feature.shaping = shaping;
-        feature.glyphQuads = glyphQuads;
-        // feature.centroid = calculteCentroid(coordinates);
+  /**
+   * 生成文字布局（对照文字纹理字典提取对应文字的位置很好信息）
+   */
+  generateGlyphLayout(iconfont) {
+    const mapping = this.getFontServiceMapping();
+    const {
+      spacing = 2,
+      textAnchor = 'center',
+      textOffset
+    } = this.layer.getLayerConfig();
+    const data = this.rawEncodeData;
+    this.glyphInfo = data.map(feature => {
+      const {
+        shape = '',
+        id,
+        size = 1
+      } = feature;
+      const offset = feature.textOffset ? feature.textOffset : textOffset || [0, 0];
+      const anchor = feature.textAnchor ? feature.textAnchor : textAnchor || 'center';
+      const shaping = (0, _symbolLayout.shapeText)(shape.toString(), mapping,
+      // @ts-ignore
+      size, anchor, 'left', spacing, offset,
+      //
+      iconfont);
+      const glyphQuads = (0, _symbolLayout.getGlyphQuads)(shaping, offset, false);
+      feature.shaping = shaping;
+      feature.glyphQuads = glyphQuads;
+      // feature.centroid = calculteCentroid(coordinates);
 
-        feature.centroid = (0, _l7Utils.calculateCentroid)(feature.coordinates);
+      feature.centroid = (0, _l7Utils.calculateCentroid)(feature.coordinates);
 
-        // 此时地图高德2.0 originCentroid == centroid
-        feature.originCentroid = feature.version === 'GAODE2.x' ? (0, _l7Utils.calculateCentroid)(feature.originCoordinates) : feature.originCentroid = feature.centroid;
-        _this2.glyphInfoMap[id] = {
-          shaping: shaping,
-          glyphQuads: glyphQuads,
-          centroid: (0, _l7Utils.calculateCentroid)(feature.coordinates)
-        };
-        return feature;
-      });
-    }
-  }, {
-    key: "getFontServiceMapping",
-    value: function getFontServiceMapping() {
-      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;
-      return this.fontService.getMappingByKey("".concat(fontFamily, "_").concat(fontWeight));
-    }
-  }, {
-    key: "getFontServiceCanvas",
-    value: function getFontServiceCanvas() {
-      var _ref8 = this.layer.getLayerConfig(),
-        _ref8$fontWeight = _ref8.fontWeight,
-        fontWeight = _ref8$fontWeight === void 0 ? '400' : _ref8$fontWeight,
-        _ref8$fontFamily = _ref8.fontFamily,
-        fontFamily = _ref8$fontFamily === void 0 ? 'sans-serif' : _ref8$fontFamily;
-      // 更新文字布局
-      return this.fontService.getCanvasByKey("".concat(fontFamily, "_").concat(fontWeight));
-    }
+      // 此时地图高德2.0 originCentroid == centroid
+      feature.originCentroid = feature.version === 'GAODE2.x' ? (0, _l7Utils.calculateCentroid)(feature.originCoordinates) : feature.originCentroid = feature.centroid;
+      this.glyphInfoMap[id] = {
+        shaping,
+        glyphQuads,
+        centroid: (0, _l7Utils.calculateCentroid)(feature.coordinates)
+      };
+      return feature;
+    });
+  }
+  getFontServiceMapping() {
+    const {
+      fontWeight = '400',
+      fontFamily = 'sans-serif'
+    } = this.layer.getLayerConfig();
+    return this.fontService.getMappingByKey(`${fontFamily}_${fontWeight}`);
+  }
+  getFontServiceCanvas() {
+    const {
+      fontWeight = '400',
+      fontFamily = 'sans-serif'
+    } = this.layer.getLayerConfig();
+    // 更新文字布局
+    return this.fontService.getCanvasByKey(`${fontFamily}_${fontWeight}`);
+  }
 
-    /**
-     * 文字避让 depend on originCentorid
-     */
-  }, {
-    key: "filterGlyphs",
-    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;
-      if (textAllowOverlap) {
-        // 如果允许文本覆盖
-        return;
-      }
-      this.glyphInfoMap = {};
-      this.currentZoom = this.mapService.getZoom();
-      this.extent = this.textExtent();
-      var _this$rendererService = this.rendererService.getViewportSize(),
-        width = _this$rendererService.width,
-        height = _this$rendererService.height;
-      var collisionIndex = new _collisionIndex.default(width, height);
-      var filterData = this.glyphInfo.filter(function (feature) {
-        var shaping = feature.shaping,
-          _feature$id = feature.id,
-          id = _feature$id === void 0 ? 0 : _feature$id;
-        // const centroid = feature.centroid as [number, number];
-        // const centroid = feature.originCentroid as [number, number];
-        var centroid = feature.version === 'GAODE2.x' ? feature.originCentroid : feature.centroid;
-        var size = feature.size;
-        var fontScale = size / 16;
-        var pixels = _this3.mapService.lngLatToContainer(centroid);
-        var _collisionIndex$place = collisionIndex.placeCollisionBox({
-            x1: shaping.left * fontScale - padding[0],
-            x2: shaping.right * fontScale + padding[0],
-            y1: shaping.top * fontScale - padding[1],
-            y2: shaping.bottom * fontScale + padding[1],
-            anchorPointX: pixels.x,
-            anchorPointY: pixels.y
-          }),
-          box = _collisionIndex$place.box;
-        if (box && box.length) {
-          collisionIndex.insertCollisionBox(box, id);
-          return true;
-        } else {
-          return false;
-        }
-      });
-      filterData.forEach(function (item) {
-        // @ts-ignore
-        _this3.glyphInfoMap[item.id] = item;
-      });
-      // this.layer.setEncodedData(filterData);
-    }
-    /**
-     * 初始化文字布局
-     */
-  }, {
-    key: "initGlyph",
-    value: function initGlyph() {
-      var _this$layer$getLayerC = this.layer.getLayerConfig(),
-        _this$layer$getLayerC2 = _this$layer$getLayerC.iconfont,
-        iconfont = _this$layer$getLayerC2 === void 0 ? false : _this$layer$getLayerC2;
-      // 1.生成文字纹理（或是生成 iconfont）
-      iconfont ? this.initIconFontTex() : this.initTextFont();
-      // 2.生成文字布局
-      this.generateGlyphLayout(iconfont);
+  /**
+   * 文字避让 depend on originCentorid
+   */
+  filterGlyphs() {
+    const {
+      padding = [0, 0],
+      textAllowOverlap = false
+    } = this.layer.getLayerConfig();
+    if (textAllowOverlap) {
+      // 如果允许文本覆盖
+      return;
     }
-    /**
-     * 更新文字纹理
-     */
-  }, {
-    key: "updateTexture",
-    value: function updateTexture() {
-      var createTexture2D = this.rendererService.createTexture2D;
-      var canvas = this.getFontServiceCanvas();
-      this.textureHeight = canvas.height;
-      if (this.texture) {
-        this.texture.destroy();
-      }
-      this.texture = createTexture2D({
-        data: canvas,
-        mag: _l7Core.gl.LINEAR,
-        min: _l7Core.gl.LINEAR,
-        width: canvas.width,
-        height: canvas.height
+    this.glyphInfoMap = {};
+    this.currentZoom = this.mapService.getZoom();
+    this.extent = this.textExtent();
+    const {
+      width,
+      height
+    } = this.rendererService.getViewportSize();
+    const collisionIndex = new _collisionIndex.default(width, height);
+    const filterData = this.glyphInfo.filter(feature => {
+      const {
+        shaping,
+        id = 0
+      } = feature;
+      // const centroid = feature.centroid as [number, number];
+      // const centroid = feature.originCentroid as [number, number];
+      const centroid = feature.version === 'GAODE2.x' ? feature.originCentroid : feature.centroid;
+      const size = feature.size;
+      const fontScale = size / 16;
+      const pixels = this.mapService.lngLatToContainer(centroid);
+      const {
+        box
+      } = collisionIndex.placeCollisionBox({
+        x1: shaping.left * fontScale - padding[0],
+        x2: shaping.right * fontScale + padding[0],
+        y1: shaping.top * fontScale - padding[1],
+        y2: shaping.bottom * fontScale + padding[1],
+        anchorPointX: pixels.x,
+        anchorPointY: pixels.y
       });
-      this.textures = [this.texture];
-    }
-  }, {
-    key: "reBuildModel",
-    value: function () {
-      var _reBuildModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
-        var model;
-        return _regenerator.default.wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
-            case 0:
-              this.filterGlyphs();
-              _context5.next = 3;
-              return this.layer.buildLayerModel({
-                moduleName: 'pointText',
-                vertexShader: textVert,
-                fragmentShader: textFrag,
-                triangulation: TextTrianglation.bind(this),
-                inject: this.getInject(),
-                depth: {
-                  enable: false
-                }
-              });
-            case 3:
-              model = _context5.sent;
-              // TODO 渲染流程待修改
-              this.layer.models = [model];
-            case 5:
-            case "end":
-              return _context5.stop();
-          }
-        }, _callee5, this);
-      }));
-      function reBuildModel() {
-        return _reBuildModel.apply(this, arguments);
+      if (box && box.length) {
+        collisionIndex.insertCollisionBox(box, id);
+        return true;
+      } else {
+        return false;
       }
-      return reBuildModel;
-    }()
-  }]);
-  return TextModel;
-}(_BaseModel2.default);
+    });
+    filterData.forEach(item => {
+      // @ts-ignore
+      this.glyphInfoMap[item.id] = item;
+    });
+    // this.layer.setEncodedData(filterData);
+  }
+  /**
+   * 初始化文字布局
+   */
+  initGlyph() {
+    const {
+      iconfont = false
+    } = this.layer.getLayerConfig();
+    // 1.生成文字纹理（或是生成 iconfont）
+    iconfont ? this.initIconFontTex() : this.initTextFont();
+    // 2.生成文字布局
+    this.generateGlyphLayout(iconfont);
+  }
+  /**
+   * 更新文字纹理
+   */
+  updateTexture() {
+    const {
+      createTexture2D
+    } = this.rendererService;
+    const canvas = this.getFontServiceCanvas();
+    this.textureHeight = canvas.height;
+    if (this.texture) {
+      this.texture.destroy();
+    }
+    this.texture = createTexture2D({
+      data: canvas,
+      mag: _l7Core.gl.LINEAR,
+      min: _l7Core.gl.LINEAR,
+      width: canvas.width,
+      height: canvas.height
+    });
+    this.textures = [this.texture];
+  }
+  reBuildModel() {
+    var _this5 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      _this5.filterGlyphs();
+      const model = yield _this5.layer.buildLayerModel({
+        moduleName: 'pointText',
+        vertexShader: textVert,
+        fragmentShader: textFrag,
+        triangulation: TextTrianglation.bind(_this5),
+        inject: _this5.getInject(),
+        depth: {
+          enable: false
+        }
+      });
+      // TODO 渲染流程待修改
+      _this5.layer.models = [model];
+    })();
+  }
+}
+exports.default = TextModel;