@antv/l7-layers 2.15.4 → 2.16.0

package/es/core/BaseLayer.js

@@ -597,7 +597,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "renderLayers",
     value: function renderLayers() {
       this.rendering = true;
-      this.layerService.renderLayers();
+      this.layerService.reRender();
       this.rendering = false;
     }
   }, {
@@ -1172,6 +1172,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                     return reject(err);
                   });
                 } else {
+                  // console.log(this.encodedData)
                   var _this9$styleAttribute = _this9.styleAttributeService.createAttributesAndIndices(_this9.encodedData, triangulation, segmentNumber),
                     attributes = _this9$styleAttribute.attributes,
                     elements = _this9$styleAttribute.elements,
@@ -1323,6 +1324,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
       if (this.encodeDataLength <= 0 && !this.forceRender) {
+        // 数据为空销毁model
+        this.clearModels();
         return this;
       }
       this.hooks.beforeRender.call();

package/es/point/models/text.d.ts

@@ -1,7 +1,7 @@
 import { IEncodeFeature, IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 import { IGlyphQuad } from '../../utils/symbol-layout';
-export declare function TextTriangulation(feature: IEncodeFeature): {
+export declare function TextTrianglation(feature: IEncodeFeature): {
     vertices: number[];
     indices: number[];
     size: number;
@@ -15,6 +15,7 @@ export default class TextModel extends BaseModel {
             centroid: number[];
         };
     };
+    private rawEncodeData;
     private texture;
     private currentZoom;
     private extent;

package/es/point/models/text.js

@@ -23,7 +23,7 @@ import { getGlyphQuads, shapeText } from "../../utils/symbol-layout";
 var textFrag = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 48.0\nuniform sampler2D u_sdf_map;\nuniform float u_gamma_scale : 0.5;\n// uniform float u_font_size : 24.0;\nuniform float u_opacity : 1.0;\nuniform vec4 u_stroke_color : [0, 0, 0, 1];\nuniform float u_stroke_width : 2.0;\nuniform float u_halo_blur : 0.5;\nuniform float u_DevicePixelRatio;\n\nvarying vec4 v_color;\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying float v_fontScale;\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\n#pragma include \"picking\"\nvoid main() {\n  // get style data mapping\n  float opacity = styleMappingMat[0][0];\n  float strokeWidth = styleMappingMat[0][2];\n  vec4 textrueStroke = vec4(\n    styleMappingMat[1][0],\n    styleMappingMat[1][1],\n    styleMappingMat[1][2],\n    styleMappingMat[1][3]\n  );\n\n  // get sdf from atlas\n  float dist = texture2D(u_sdf_map, v_uv).a;\n\n  // float fontScale = u_font_size / FONT_SIZE;\n\n  // lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;\n  lowp float buff = (6.0 - strokeWidth / 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  // gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), vec4(u_stroke_color.rgb, u_stroke_color.a * u_opacity), smoothstep(0., 0.5, 1. - dist));\n  gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), vec4(textrueStroke.rgb, textrueStroke.a * opacity), smoothstep(0., 0.5, 1. - dist));\n  gl_FragColor.a= gl_FragColor.a * alpha;\n   // \u4F5C\u4E3A mask \u6A21\u677F\u65F6\u9700\u8981\u4E22\u5F03\u900F\u660E\u7684\u50CF\u7D20\n  if (gl_FragColor.a < 0.01) {\n    discard;\n  }\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/text_vert.glsl' */
 var textVert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\nattribute vec3 a_Position;\nattribute vec2 a_tex;\nattribute vec2 a_textOffsets;\nattribute vec4 a_Color;\nattribute float a_Size;\nattribute float a_Rotate;\n\nuniform vec2 u_sdf_map_size;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying vec4 v_color;\nvarying float v_fontScale;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\nuniform float u_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n   styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n\n   vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][2] = strokeWidthAndOffset.r;\n  textureOffset = strokeWidthAndOffset.g;\n\n  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);\n  if(hasStroke()) {\n    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R\n    textureOffset += 1.0;\n\n    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G\n    textureOffset += 1.0;\n\n    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B\n    textureOffset += 1.0;\n\n    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A\n    textureOffset += 1.0;\n  } else {\n    if(u_stroke_color == vec4(0.0)) {\n      styleMappingMat[1][0] = v_color.r;\n      styleMappingMat[1][1] = v_color.g;\n      styleMappingMat[1][2] = v_color.b;\n      styleMappingMat[1][3] = v_color.a;\n    } else {\n      styleMappingMat[1][0] = u_stroke_color.r;\n      styleMappingMat[1][1] = u_stroke_color.g;\n      styleMappingMat[1][2] = u_stroke_color.b;\n      styleMappingMat[1][3] = u_stroke_color.a;\n    }\n  }\n  \n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_color = a_Color;\n  v_uv = a_tex / u_sdf_map_size;\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  highp float angle_sin = sin(a_Rotate);\n  highp float angle_cos = cos(a_Rotate);\n  mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);\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;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n   projected_position  = u_Mvp *(vec4(a_Position.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n  } else { // else\n   projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n  }\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * 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";
-export function TextTriangulation(feature) {
+export function TextTrianglation(feature) {
   // @ts-ignore
   var that = this;
   var id = feature.id;
@@ -120,7 +120,6 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           width = _this$calDataFrame.width,
           height = _this$calDataFrame.height;
         this.rowCount = height; // 当前数据纹理有多少行
-
         this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
           flipY: true,
           data: data,
@@ -161,9 +160,10 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
               // 绑定事件
               this.bindEvent();
               this.extent = this.textExtent();
+              this.rawEncodeData = this.layer.getEncodedData();
               this.preTextStyle = this.getTextStyle();
               return _context2.abrupt("return", this.buildModels());
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -193,7 +193,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
                 moduleName: 'pointText',
                 vertexShader: textVert,
                 fragmentShader: textFrag,
-                triangulation: TextTriangulation.bind(this),
+                triangulation: TextTrianglation.bind(this),
                 depth: {
                   enable: false
                 }
@@ -374,7 +374,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
       var _this$getTextStyle = this.getTextStyle(),
         fontWeight = _this$getTextStyle.fontWeight,
         fontFamily = _this$getTextStyle.fontFamily;
-      var data = this.layer.getEncodedData();
+      var data = this.rawEncodeData;
       var characterSet = [];
       data.forEach(function (item) {
         var _item$shape = item.shape,
@@ -413,7 +413,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
       var _this$getTextStyle2 = this.getTextStyle(),
         fontWeight = _this$getTextStyle2.fontWeight,
         fontFamily = _this$getTextStyle2.fontFamily;
-      var data = this.layer.getEncodedData();
+      var data = this.rawEncodeData;
       var characterSet = [];
       data.forEach(function (item) {
         var _item$shape2 = item.shape,
@@ -482,7 +482,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
         _ref6$textAnchor = _ref6.textAnchor,
         textAnchor = _ref6$textAnchor === void 0 ? 'center' : _ref6$textAnchor,
         textOffset = _ref6.textOffset;
-      var data = this.layer.getEncodedData();
+      var data = this.rawEncodeData;
       this.glyphInfo = data.map(function (feature) {
         var _feature$shape = feature.shape,
           shape = _feature$shape === void 0 ? '' : _feature$shape,
@@ -634,7 +634,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
                 moduleName: 'pointText',
                 vertexShader: textVert,
                 fragmentShader: textFrag,
-                triangulation: TextTriangulation.bind(this),
+                triangulation: TextTrianglation.bind(this),
                 depth: {
                   enable: false
                 }

package/es/tile/service/TileLayerService.js

@@ -86,8 +86,12 @@ export var TileLayerService = /*#__PURE__*/function () {
       //     tile?.updateVisible(false);
       //   }
       // }
-
       tile === null || tile === void 0 ? void 0 : tile.updateVisible(sourceTile.isVisible);
+      // if (sourceTile.isVisible) {
+      //   tile?.updateVisible(sourceTile.isVisible);
+      // } else {
+      //   this.removeTile(sourceTile.key);
+      // }
     }
   }, {
     key: "isParentLoaded",
@@ -143,8 +147,9 @@ export var TileLayerService = /*#__PURE__*/function () {
                   return _ref2.apply(this, arguments);
                 };
               }());
-              Promise.all(renders);
-            case 3:
+              _context2.next = 4;
+              return Promise.all(renders);
+            case 4:
             case "end":
               return _context2.stop();
           }

package/es/tile/tileFactory/DebugTile.js

@@ -30,12 +30,13 @@ var DebugTile = /*#__PURE__*/function (_Tile) {
               lineLayer = new LineLayer().source(sourceOptions.data, sourceOptions.options).size(1).shape('line').color('red');
               pointLayer = new PointLayer({
                 minZoom: this.z - 1,
-                maxZoom: this.z + 1
+                maxZoom: this.z + 1,
+                textAllowOverlap: true
               }).source([pointData], {
                 parser: {
                   type: 'json',
-                  x: 'textLng',
-                  y: 'textLat'
+                  x: 'x',
+                  y: 'y'
                 }
               }).size(20).color('red').shape(this.key).style({
                 stroke: '#fff',

package/es/tile/tileFactory/Tile.d.ts

@@ -18,6 +18,7 @@ export default abstract class Tile implements ITile {
     abstract initTileLayer(): Promise<void>;
     lnglatInBounds(lnglat: ILngLat): boolean;
     protected getLayerOptions(): {
+        textAllowOverlap: boolean;
         autoFit: boolean;
         maskLayers: ILayer[];
         tileMask: boolean;

package/es/tile/tileFactory/Tile.js

@@ -52,6 +52,8 @@ var Tile = /*#__PURE__*/function () {
       var _options$maskLayers;
       var options = this.parent.getLayerConfig();
       return _objectSpread(_objectSpread({}, options), {}, {
+        textAllowOverlap: true,
+        // 文本允许重叠
         autoFit: false,
         maskLayers: this.getMaskLayer(),
         tileMask: isNeedMask(this.parent.type),

package/lib/core/BaseLayer.js

@@ -603,7 +603,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "renderLayers",
     value: function renderLayers() {
       this.rendering = true;
-      this.layerService.renderLayers();
+      this.layerService.reRender();
       this.rendering = false;
     }
   }, {
@@ -1178,6 +1178,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
                     return reject(err);
                   });
                 } else {
+                  // console.log(this.encodedData)
                   var _this9$styleAttribute = _this9.styleAttributeService.createAttributesAndIndices(_this9.encodedData, triangulation, segmentNumber),
                     attributes = _this9$styleAttribute.attributes,
                     elements = _this9$styleAttribute.elements,
@@ -1329,6 +1330,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       // TODO: this.getEncodedData().length > 0 这个判断是为了解决在 2.5.x 引入数据纹理后产生的 空数据渲染导致 texture 超出上限问题
       if (this.encodeDataLength <= 0 && !this.forceRender) {
+        // 数据为空销毁model
+        this.clearModels();
         return this;
       }
       this.hooks.beforeRender.call();

package/lib/point/models/text.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TextTriangulation = TextTriangulation;
+exports.TextTrianglation = TextTrianglation;
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -31,7 +31,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var textFrag = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 48.0\nuniform sampler2D u_sdf_map;\nuniform float u_gamma_scale : 0.5;\n// uniform float u_font_size : 24.0;\nuniform float u_opacity : 1.0;\nuniform vec4 u_stroke_color : [0, 0, 0, 1];\nuniform float u_stroke_width : 2.0;\nuniform float u_halo_blur : 0.5;\nuniform float u_DevicePixelRatio;\n\nvarying vec4 v_color;\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying float v_fontScale;\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\n#pragma include \"picking\"\nvoid main() {\n  // get style data mapping\n  float opacity = styleMappingMat[0][0];\n  float strokeWidth = styleMappingMat[0][2];\n  vec4 textrueStroke = vec4(\n    styleMappingMat[1][0],\n    styleMappingMat[1][1],\n    styleMappingMat[1][2],\n    styleMappingMat[1][3]\n  );\n\n  // get sdf from atlas\n  float dist = texture2D(u_sdf_map, v_uv).a;\n\n  // float fontScale = u_font_size / FONT_SIZE;\n\n  // lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;\n  lowp float buff = (6.0 - strokeWidth / 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  // gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), vec4(u_stroke_color.rgb, u_stroke_color.a * u_opacity), smoothstep(0., 0.5, 1. - dist));\n  gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), vec4(textrueStroke.rgb, textrueStroke.a * opacity), smoothstep(0., 0.5, 1. - dist));\n  gl_FragColor.a= gl_FragColor.a * alpha;\n   // \u4F5C\u4E3A mask \u6A21\u677F\u65F6\u9700\u8981\u4E22\u5F03\u900F\u660E\u7684\u50CF\u7D20\n  if (gl_FragColor.a < 0.01) {\n    discard;\n  }\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/text_vert.glsl' */
 var textVert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\nattribute vec3 a_Position;\nattribute vec2 a_tex;\nattribute vec2 a_textOffsets;\nattribute vec4 a_Color;\nattribute float a_Size;\nattribute float a_Rotate;\n\nuniform vec2 u_sdf_map_size;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying vec4 v_color;\nvarying float v_fontScale;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\nuniform float u_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n   styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n\n   vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][2] = strokeWidthAndOffset.r;\n  textureOffset = strokeWidthAndOffset.g;\n\n  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);\n  if(hasStroke()) {\n    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R\n    textureOffset += 1.0;\n\n    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G\n    textureOffset += 1.0;\n\n    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B\n    textureOffset += 1.0;\n\n    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A\n    textureOffset += 1.0;\n  } else {\n    if(u_stroke_color == vec4(0.0)) {\n      styleMappingMat[1][0] = v_color.r;\n      styleMappingMat[1][1] = v_color.g;\n      styleMappingMat[1][2] = v_color.b;\n      styleMappingMat[1][3] = v_color.a;\n    } else {\n      styleMappingMat[1][0] = u_stroke_color.r;\n      styleMappingMat[1][1] = u_stroke_color.g;\n      styleMappingMat[1][2] = u_stroke_color.b;\n      styleMappingMat[1][3] = u_stroke_color.a;\n    }\n  }\n  \n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_color = a_Color;\n  v_uv = a_tex / u_sdf_map_size;\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  highp float angle_sin = sin(a_Rotate);\n  highp float angle_cos = cos(a_Rotate);\n  mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);\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;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n   projected_position  = u_Mvp *(vec4(a_Position.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n  } else { // else\n   projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n  }\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * 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";
-function TextTriangulation(feature) {
+function TextTrianglation(feature) {
   // @ts-ignore
   var that = this;
   var id = feature.id;
@@ -128,7 +128,6 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           width = _this$calDataFrame.width,
           height = _this$calDataFrame.height;
         this.rowCount = height; // 当前数据纹理有多少行
-
         this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
           flipY: true,
           data: data,
@@ -169,9 +168,10 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
               // 绑定事件
               this.bindEvent();
               this.extent = this.textExtent();
+              this.rawEncodeData = this.layer.getEncodedData();
               this.preTextStyle = this.getTextStyle();
               return _context2.abrupt("return", this.buildModels());
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -201,7 +201,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
                 moduleName: 'pointText',
                 vertexShader: textVert,
                 fragmentShader: textFrag,
-                triangulation: TextTriangulation.bind(this),
+                triangulation: TextTrianglation.bind(this),
                 depth: {
                   enable: false
                 }
@@ -382,7 +382,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
       var _this$getTextStyle = this.getTextStyle(),
         fontWeight = _this$getTextStyle.fontWeight,
         fontFamily = _this$getTextStyle.fontFamily;
-      var data = this.layer.getEncodedData();
+      var data = this.rawEncodeData;
       var characterSet = [];
       data.forEach(function (item) {
         var _item$shape = item.shape,
@@ -421,7 +421,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
       var _this$getTextStyle2 = this.getTextStyle(),
         fontWeight = _this$getTextStyle2.fontWeight,
         fontFamily = _this$getTextStyle2.fontFamily;
-      var data = this.layer.getEncodedData();
+      var data = this.rawEncodeData;
       var characterSet = [];
       data.forEach(function (item) {
         var _item$shape2 = item.shape,
@@ -490,7 +490,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
         _ref6$textAnchor = _ref6.textAnchor,
         textAnchor = _ref6$textAnchor === void 0 ? 'center' : _ref6$textAnchor,
         textOffset = _ref6.textOffset;
-      var data = this.layer.getEncodedData();
+      var data = this.rawEncodeData;
       this.glyphInfo = data.map(function (feature) {
         var _feature$shape = feature.shape,
           shape = _feature$shape === void 0 ? '' : _feature$shape,
@@ -642,7 +642,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
                 moduleName: 'pointText',
                 vertexShader: textVert,
                 fragmentShader: textFrag,
-                triangulation: TextTriangulation.bind(this),
+                triangulation: TextTrianglation.bind(this),
                 depth: {
                   enable: false
                 }

package/lib/tile/service/TileLayerService.js

@@ -93,8 +93,12 @@ var TileLayerService = /*#__PURE__*/function () {
       //     tile?.updateVisible(false);
       //   }
       // }
-
       tile === null || tile === void 0 ? void 0 : tile.updateVisible(sourceTile.isVisible);
+      // if (sourceTile.isVisible) {
+      //   tile?.updateVisible(sourceTile.isVisible);
+      // } else {
+      //   this.removeTile(sourceTile.key);
+      // }
     }
   }, {
     key: "isParentLoaded",
@@ -150,8 +154,9 @@ var TileLayerService = /*#__PURE__*/function () {
                   return _ref2.apply(this, arguments);
                 };
               }());
-              Promise.all(renders);
-            case 3:
+              _context2.next = 4;
+              return Promise.all(renders);
+            case 4:
             case "end":
               return _context2.stop();
           }

package/lib/tile/tileFactory/DebugTile.js

@@ -37,12 +37,13 @@ var DebugTile = /*#__PURE__*/function (_Tile) {
               lineLayer = new _line.default().source(sourceOptions.data, sourceOptions.options).size(1).shape('line').color('red');
               pointLayer = new _point.default({
                 minZoom: this.z - 1,
-                maxZoom: this.z + 1
+                maxZoom: this.z + 1,
+                textAllowOverlap: true
               }).source([pointData], {
                 parser: {
                   type: 'json',
-                  x: 'textLng',
-                  y: 'textLat'
+                  x: 'x',
+                  y: 'y'
                 }
               }).size(20).color('red').shape(this.key).style({
                 stroke: '#fff',

package/lib/tile/tileFactory/Tile.js

@@ -59,6 +59,8 @@ var Tile = /*#__PURE__*/function () {
       var _options$maskLayers;
       var options = this.parent.getLayerConfig();
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, options), {}, {
+        textAllowOverlap: true,
+        // 文本允许重叠
         autoFit: false,
         maskLayers: this.getMaskLayer(),
         tileMask: (0, _util.isNeedMask)(this.parent.type),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.15.4",
+  "version": "2.16.0",
   "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.15.4",
-    "@antv/l7-maps": "2.15.4",
-    "@antv/l7-source": "2.15.4",
-    "@antv/l7-utils": "2.15.4",
+    "@antv/l7-core": "2.16.0",
+    "@antv/l7-maps": "2.16.0",
+    "@antv/l7-source": "2.16.0",
+    "@antv/l7-utils": "2.16.0",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -53,7 +53,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.15.4",
+    "@antv/l7-test-utils": "2.16.0",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -62,7 +62,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "ab8429be57c8950a65493e33eb2fa9b38b2a125f",
+  "gitHead": "901d07c0523b128fbc69ca04e6b3b8367ea3572d",
   "publishConfig": {
     "access": "public"
   }