@antv/l7-layers 2.15.4 → 2.15.5

package/es/core/BaseLayer.js

@@ -1323,6 +1323,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.js

@@ -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,

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

@@ -1329,6 +1329,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

@@ -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,

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.15.5",
   "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.15.5",
+    "@antv/l7-maps": "2.15.5",
+    "@antv/l7-source": "2.15.5",
+    "@antv/l7-utils": "2.15.5",
     "@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.15.5",
     "@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": "34b1d7f086f6df375fc8c9c03253b864974a66df",
   "publishConfig": {
     "access": "public"
   }