@antv/l7-layers 2.14.1 → 2.14.3

package/lib/polygon/models/ocean.js

@@ -111,14 +111,12 @@ var OceanModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
-
+        var model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-                _context2.next = 3;
+                _context2.next = 2;
                 return this.layer.buildLayerModel({
                   moduleName: 'polygonOcean',
                   vertexShader: ocean_vert,
@@ -127,15 +125,14 @@ var OceanModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: _l7Core.gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                  }
                 });
 
-              case 3:
+              case 2:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 5:
+              case 4:
               case "end":
                 return _context2.stop();
             }

package/lib/polygon/models/water.js

@@ -27,8 +27,6 @@ var _l7Core = require("@antv/l7-core");
 
 var _l7Maps = require("@antv/l7-maps");
 
-var _l7Utils = require("@antv/l7-utils");
-
 var _lodash = require("lodash");
 
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
@@ -106,14 +104,12 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
-
+        var model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-                _context2.next = 3;
+                _context2.next = 2;
                 return this.layer.buildLayerModel({
                   moduleName: 'polygonWater',
                   vertexShader: water_vert,
@@ -122,15 +118,14 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: _l7Core.gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                  }
                 });
 
-              case 3:
+              case 2:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 5:
+              case 4:
               case "end":
                 return _context2.stop();
             }
@@ -193,8 +188,8 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
     value: function loadTexture() {
       var _this = this;
 
-      var _ref3 = this.layer.getLayerConfig(),
-          waterTexture = _ref3.waterTexture;
+      var _ref2 = this.layer.getLayerConfig(),
+          waterTexture = _ref2.waterTexture;
 
       var createTexture2D = this.rendererService.createTexture2D;
       this.texture = createTexture2D({

package/lib/raster/models/raster.js

@@ -34,7 +34,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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/raster_2d_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n    gl_FragColor = vec4(0, 0, 0, 0);\n  else {\n   \n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n  }\n}\n";
+var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\n      discard;\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n     discard;\n  else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    \n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n    if(gl_FragColor.a < 0.01)\n      discard;\n   \n  }\n}\n";
 
 /* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
 var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
@@ -130,20 +130,19 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
+        var source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
 
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
                 source = this.layer.getSource();
                 createTexture2D = this.rendererService.createTexture2D;
                 parserDataItem = source.data.dataArray[0];
-                _context2.next = 6;
+                _context2.next = 5;
                 return this.getRasterData(parserDataItem);
 
-              case 6:
+              case 5:
                 _yield$this$getRaster = _context2.sent;
                 data = _yield$this$getRaster.data;
                 width = _yield$this$getRaster.width;
@@ -156,7 +155,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   type: _l7Core.gl.FLOAT // aniso: 4,
 
                 });
-                _context2.next = 13;
+                _context2.next = 12;
                 return this.layer.buildLayerModel({
                   moduleName: 'rasterImageData',
                   vertexShader: rasterVert,
@@ -165,15 +164,14 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: _l7Core.gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                  }
                 });
 
-              case 13:
+              case 12:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 15:
+              case 14:
               case "end":
                 return _context2.stop();
             }

package/lib/raster/models/rasterRgb.js

@@ -31,8 +31,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _l7Core = require("@antv/l7-core");
 
-var _l7Utils = require("@antv/l7-utils");
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 
 var _triangulation = require("../../core/triangulation");
@@ -48,7 +46,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
 
 /* babel-plugin-inline-import '../shaders/raster_rgb_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform vec2 u_rminmax: vec2(0,255); \nuniform vec2 u_gminmax: vec2(0,255);\nuniform vec2 u_bminmax: vec2(0,255);\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform float u_noDataValue : 0.0;\nvarying vec2 v_texCoord;\n\nvoid main() {\n  vec3 rgb = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).rgb;\n  if(rgb == vec3(u_noDataValue)) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    gl_FragColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);\n  }\n \n}";
+var rasterFrag = "precision mediump float;\nuniform vec2 u_rminmax: vec2(0,255); \nuniform vec2 u_gminmax: vec2(0,255);\nuniform vec2 u_bminmax: vec2(0,255);\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform float u_noDataValue : 0.0;\nvarying vec2 v_texCoord;\n\nvoid main() {\n  vec3 rgb = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).rgb;\n  if(rgb == vec3(u_noDataValue)) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    gl_FragColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);\n  }\n  if(gl_FragColor.a < 0.01)\n    discard;\n \n}";
 
 var RasterModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(RasterModel, _BaseModel);
@@ -154,20 +152,19 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
+        var source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
 
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
                 source = this.layer.getSource();
                 createTexture2D = this.rendererService.createTexture2D;
                 parserDataItem = source.data.dataArray[0];
-                _context2.next = 6;
+                _context2.next = 5;
                 return this.getRasterData(parserDataItem);
 
-              case 6:
+              case 5:
                 _yield$this$getRaster = _context2.sent;
                 data = _yield$this$getRaster.data;
                 width = _yield$this$getRaster.width;
@@ -180,7 +177,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   format: _l7Core.gl.RGB,
                   type: _l7Core.gl.FLOAT
                 });
-                _context2.next = 13;
+                _context2.next = 12;
                 return this.layer.buildLayerModel({
                   moduleName: 'rasterImageDataRGBA',
                   vertexShader: rasterVert,
@@ -189,15 +186,14 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   primitive: _l7Core.gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                  }
                 });
 
-              case 13:
+              case 12:
                 model = _context2.sent;
                 return _context2.abrupt("return", [model]);
 
-              case 15:
+              case 14:
               case "end":
                 return _context2.stop();
             }

package/lib/raster/models/rasterTerrainRgb.js

@@ -34,7 +34,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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/raster_terrain_rgb_frag.glsl' */
-var Raster_terrainFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nvarying vec2 v_texCoord;\n\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\n\nvoid main() {\n  vec4 baseColor = texture2D(u_texture, vec2(v_texCoord.x, v_texCoord.y)) * 256.0;\n  float r = baseColor.r * 256.0 * 256.0;\n  float g = baseColor.g * 256.0;\n  float b = baseColor.b;\n  float value =  (r + g + b) * 0.1 - 10000.0;\n  \n  if (value == u_noDataValue) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {\n     gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec4 color = texture2D(u_colorTexture, vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n  }\n}\n";
+var Raster_terrainFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nvarying vec2 v_texCoord;\n\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\n\nvoid main() {\n  vec4 baseColor = texture2D(u_texture, vec2(v_texCoord.x, v_texCoord.y)) * 256.0;\n  float r = baseColor.r * 256.0 * 256.0;\n  float g = baseColor.g * 256.0;\n  float b = baseColor.b;\n  float value =  (r + g + b) * 0.1 - 10000.0;\n  \n  if (value == u_noDataValue) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {\n     gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec4 color = texture2D(u_colorTexture, vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n      if(gl_FragColor.a < 0.01)\n      discard;\n  }\n}\n";
 
 /* babel-plugin-inline-import '../shaders/rater_terrain_rgb_vert.glsl' */
 var Raster_terrainVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
@@ -87,26 +87,24 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
     key: "initModels",
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, imageData, model;
-
+        var source, createTexture2D, imageData, model;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
                 source = this.layer.getSource();
                 createTexture2D = this.rendererService.createTexture2D;
-                _context.next = 5;
+                _context.next = 4;
                 return source.data.images;
 
-              case 5:
+              case 4:
                 imageData = _context.sent;
                 this.texture = createTexture2D({
                   data: imageData[0],
                   width: imageData[0].width,
                   height: imageData[0].height
                 });
-                _context.next = 9;
+                _context.next = 8;
                 return this.layer.buildLayerModel({
                   moduleName: 'RasterTileDataImage',
                   vertexShader: Raster_terrainVert,
@@ -115,16 +113,14 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
                   primitive: _l7Core.gl.TRIANGLES,
                   depth: {
                     enable: false
-                  },
-                  blend: this.getBlend(),
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                  }
                 });
 
-              case 9:
+              case 8:
                 model = _context.sent;
                 return _context.abrupt("return", [model]);
 
-              case 11:
+              case 10:
               case "end":
                 return _context.stop();
             }

package/lib/raster/shaders/raster_2d_frag.glsl

@@ -16,14 +16,17 @@ void main() {
 
   float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;
   if (value == u_noDataValue || isnan_emu(value))
-    gl_FragColor = vec4(0.0, 0, 0, 0.0);
+      discard;
   else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))
-    gl_FragColor = vec4(0, 0, 0, 0);
+     discard;
   else {
-   
     float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);
     vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));
+    
     gl_FragColor = color;
     gl_FragColor.a =  gl_FragColor.a * u_opacity ;
+    if(gl_FragColor.a < 0.01)
+      discard;
+   
   }
 }

package/lib/raster/shaders/raster_frag.glsl

@@ -5,5 +5,7 @@ uniform float u_opacity: 1.0;
 void main() {
    gl_FragColor = v_color;
    gl_FragColor.a *= u_opacity;
+   if(gl_FragColor.a < 0.01)
+   discard;
 
 }

package/lib/raster/shaders/raster_rgb_frag.glsl

@@ -14,5 +14,7 @@ void main() {
   } else {
     gl_FragColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);
   }
+  if(gl_FragColor.a < 0.01)
+    discard;
  
 }

package/lib/raster/shaders/raster_terrain_rgb_frag.glsl

@@ -27,5 +27,7 @@ void main() {
     vec4 color = texture2D(u_colorTexture, vec2(normalisedValue, 0));
     gl_FragColor = color;
     gl_FragColor.a =  gl_FragColor.a * u_opacity ;
+      if(gl_FragColor.a < 0.01)
+      discard;
   }
 }

package/lib/tile/service/TileLayerService.js

@@ -145,20 +145,20 @@ var TileLayerService = /*#__PURE__*/function () {
       var _render = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var _this2 = this;
 
-        var layers;
+        var layers, renders;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
                 layers = this.getRenderLayers();
-                layers.map( /*#__PURE__*/function () {
+                renders = layers.map( /*#__PURE__*/function () {
                   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer) {
                     return _regenerator.default.wrap(function _callee$(_context) {
                       while (1) {
                         switch (_context.prev = _context.next) {
                           case 0:
                             _context.next = 2;
-                            return _this2.layerService.renderLayer(layer);
+                            return _this2.layerService.renderTileLayer(layer);
 
                           case 2:
                           case "end":
@@ -172,8 +172,9 @@ var TileLayerService = /*#__PURE__*/function () {
                     return _ref2.apply(this, arguments);
                   };
                 }());
+                Promise.all(renders);
 
-              case 2:
+              case 3:
               case "end":
                 return _context2.stop();
             }

package/lib/tile/style/constants.js

@@ -11,5 +11,5 @@ var ProxyFuncs = [
  * 1. 需要作用到所属子图层才会生效的方法
  * 2. 不需要主动重新创建 model 的方法
  */
-'shape', 'color', 'size', 'style', 'animate', 'filter', 'rotate', 'scale', 'setBlend', 'setSelect', 'setActive'];
+'shape', 'color', 'size', 'style', 'animate', 'filter', 'rotate', 'scale', 'setBlend', 'setSelect', 'setActive', 'disableMask', 'enableMask'];
 exports.ProxyFuncs = ProxyFuncs;

package/lib/tile/tileFactory/Tile.js

@@ -23,6 +23,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _l7Core = require("@antv/l7-core");
 
+var _polygon = _interopRequireDefault(require("../../polygon"));
+
 var _util = require("./util");
 
 var Tile = /*#__PURE__*/function () {
@@ -31,6 +33,7 @@ var Tile = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "visible", true);
     (0, _defineProperty2.default)(this, "layers", []);
     (0, _defineProperty2.default)(this, "isLoaded", false);
+    (0, _defineProperty2.default)(this, "tileMaskLayers", []);
     this.parent = parent;
     this.sourceTile = sourceTile;
     this.x = sourceTile.x;
@@ -66,30 +69,80 @@ var Tile = /*#__PURE__*/function () {
   }, {
     key: "getLayerOptions",
     value: function getLayerOptions() {
+      var _options$maskLayers;
+
       var options = this.parent.getLayerConfig();
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, options), {}, {
         autoFit: false,
-        mask: (0, _util.isNeedMask)(this.parent.type) || options.mask
+        maskLayers: this.getMaskLayer(),
+        tileMask: (0, _util.isNeedMask)(this.parent.type),
+        mask: options.mask || ((_options$maskLayers = options.maskLayers) === null || _options$maskLayers === void 0 ? void 0 : _options$maskLayers.length) !== 0 && options.enableMask
+      });
+    } // 获取Mask 图层
+
+  }, {
+    key: "getMaskLayer",
+    value: function getMaskLayer() {
+      var _this = this;
+
+      var _this$parent$getLayer = this.parent.getLayerConfig(),
+          maskLayers = _this$parent$getLayer.maskLayers;
+
+      var layers = [];
+      maskLayers === null || maskLayers === void 0 ? void 0 : maskLayers.forEach(function (layer) {
+        if (!layer.tileLayer) {
+          // 非瓦片图层返回图层本身，瓦片图层返回对应的行列号图层
+          layers.push(layer);
+          return layer;
+        }
+
+        var tileLayer = layer.tileLayer;
+        var tile = tileLayer.getTile(_this.sourceTile.key);
+        var l = tile === null || tile === void 0 ? void 0 : tile.getLayers()[0];
+
+        if (l) {
+          layers.push(l);
+        }
       });
+      return layers;
     }
   }, {
-    key: "addMask",
+    key: "addTileMask",
     value: function () {
-      var _addMask = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer, mask) {
-        var container;
+      var _addTileMask = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var mask, container, mainLayer;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                mask = new _polygon.default({
+                  visible: false,
+                  enablePicking: false
+                }).source({
+                  type: 'FeatureCollection',
+                  features: [this.sourceTile.bboxPolygon]
+                }, {
+                  parser: {
+                    type: 'geojson',
+                    featureId: 'id'
+                  }
+                }).shape('fill');
                 container = (0, _l7Core.createLayerContainer)(this.parent.sceneContainer);
                 mask.setContainer(container, this.parent.sceneContainer);
-                _context.next = 4;
+                _context.next = 5;
                 return mask.init();
 
-              case 4:
-                layer.addMaskLayer(mask);
-
               case 5:
+                this.tileMask = mask;
+                mainLayer = this.getMainLayer();
+
+                if (mainLayer !== undefined) {
+                  mainLayer.tileMask = mask;
+                }
+
+                return _context.abrupt("return", mask);
+
+              case 9:
               case "end":
                 return _context.stop();
             }
@@ -97,6 +150,38 @@ var Tile = /*#__PURE__*/function () {
         }, _callee, this);
       }));
 
+      function addTileMask() {
+        return _addTileMask.apply(this, arguments);
+      }
+
+      return addTileMask;
+    }()
+  }, {
+    key: "addMask",
+    value: function () {
+      var _addMask = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(layer, mask) {
+        var container;
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                container = (0, _l7Core.createLayerContainer)(this.parent.sceneContainer);
+                mask.setContainer(container, this.parent.sceneContainer);
+                _context2.next = 4;
+                return mask.init();
+
+              case 4:
+                layer.addMask(mask);
+                this.tileMaskLayers.push(mask);
+
+              case 6:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
       function addMask(_x, _x2) {
         return _addMask.apply(this, arguments);
       }
@@ -106,26 +191,26 @@ var Tile = /*#__PURE__*/function () {
   }, {
     key: "addLayer",
     value: function () {
-      var _addLayer = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(layer) {
+      var _addLayer = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(layer) {
         var container;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 // set flag
                 layer.isTileLayer = true;
                 container = (0, _l7Core.createLayerContainer)(this.parent.sceneContainer);
                 layer.setContainer(container, this.parent.sceneContainer);
                 this.layers.push(layer);
-                _context2.next = 6;
+                _context3.next = 6;
                 return layer.init();
 
               case 6:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
 
       function addLayer(_x3) {
@@ -175,6 +260,9 @@ var Tile = /*#__PURE__*/function () {
   }, {
     key: "destroy",
     value: function destroy() {
+      var _this$tileMask;
+
+      (_this$tileMask = this.tileMask) === null || _this$tileMask === void 0 ? void 0 : _this$tileMask.destroy();
       this.layers.forEach(function (layer) {
         return layer.destroy();
       });

package/lib/tile/tileFactory/VectorTile.js

@@ -23,8 +23,6 @@ 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");
@@ -75,18 +73,17 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
 
                   layer[attr]((_attributes$attr = attributes[attr]) === null || _attributes$attr === void 0 ? void 0 : _attributes$attr.field, (_attributes$attr2 = attributes[attr]) === null || _attributes$attr2 === void 0 ? void 0 : _attributes$attr2.values);
                 });
+                _context.next = 11;
+                return this.addLayer(layer);
 
-                if (!layerOptions.mask) {
-                  _context.next = 12;
+              case 11:
+                if (!layerOptions.tileMask) {
+                  _context.next = 14;
                   break;
                 }
 
-                _context.next = 12;
-                return this.addTileMask(layer);
-
-              case 12:
                 _context.next = 14;
-                return this.addLayer(layer);
+                return this.addTileMask();
 
               case 14:
                 this.setLayerMinMaxZoom(layer);
@@ -105,44 +102,6 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
       }
 
       return initTileLayer;
-    }() // Todo 校验数据有效性
-
-  }, {
-    key: "addTileMask",
-    value: function () {
-      var _addTileMask = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(layer) {
-        var mask;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                mask = new _mask.default({
-                  layerType: 'MaskLayer'
-                }).source({
-                  type: 'FeatureCollection',
-                  features: [this.sourceTile.bboxPolygon]
-                }, {
-                  parser: {
-                    type: 'geojson',
-                    featureId: 'id'
-                  }
-                });
-                _context2.next = 3;
-                return this.addMask(layer, mask);
-
-              case 3:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function addTileMask(_x) {
-        return _addTileMask.apply(this, arguments);
-      }
-
-      return addTileMask;
     }()
   }, {
     key: "getSourceOption",