@antv/l7-layers 2.20.13 → 2.20.15

package/lib/raster/models/raster.js

@@ -21,9 +21,9 @@ var _triangulation = require("../../core/triangulation");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /* babel-plugin-inline-import '../shaders/raster/raster_2d_frag.glsl' */
-var rasterFrag = "layout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  bool u_clampLow;\n  bool u_clampHigh;\n};\n\nuniform sampler2D u_rasterTexture;\nuniform sampler2D u_colorTexture;\n\nin vec2 v_texCoord;\n\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\nout vec4 outputColor;\n\nvoid main() {\n  // Can use any component here since u_rasterTexture is under luminance format.\n  float value = texture(SAMPLER_2D(u_rasterTexture), 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 = texture(SAMPLER_2D(u_colorTexture), vec2(normalisedValue, 0));\n    \n    outputColor = color;\n    outputColor.a = outputColor.a * u_opacity ;\n    if (outputColor.a < 0.01)\n      discard;\n  }\n}\n";
+var rasterFrag = "layout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  float u_clampLow;\n  float u_clampHigh;\n};\n\nuniform sampler2D u_rasterTexture;\nuniform sampler2D u_colorTexture;\n\nin vec2 v_texCoord;\n\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\nout vec4 outputColor;\n\nvoid main() {\n  // Can use any component here since u_rasterTexture is under luminance format.\n  float value = texture(SAMPLER_2D(u_rasterTexture), vec2(v_texCoord.x, v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value)) {\n    discard;\n  } else if ((u_clampLow < 0.5 && value < u_domain[0]) || (u_clampHigh < 0.5 && value > u_domain[1])) {\n    discard;\n  } else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec4 color = texture(SAMPLER_2D(u_colorTexture), vec2(normalisedValue, 0));\n    \n    outputColor = color;\n    outputColor.a = outputColor.a * u_opacity ;\n    if (outputColor.a < 0.01)\n      discard;\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/raster/raster_2d_vert.glsl' */
-var rasterVert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  bool u_clampLow;\n  bool u_clampHigh;\n};\n\nout vec2 v_texCoord;\n\n#pragma include \"projection\"\n\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_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
+var rasterVert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  float u_clampLow;\n  float u_clampHigh;\n};\n\nout vec2 v_texCoord;\n\n#pragma include \"projection\"\n\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_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
 var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(RasterModel, _BaseModel);
   var _super = _createSuper(RasterModel);
@@ -59,8 +59,8 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         u_domain: newdomain,
         u_opacity: opacity || 1,
         u_noDataValue: noDataValue,
-        u_clampLow: clampLow,
-        u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
+        u_clampLow: clampLow ? 1 : 0,
+        u_clampHigh: (typeof clampHigh !== 'undefined' ? clampHigh : clampLow) ? 1 : 0,
         u_rasterTexture: this.texture,
         u_colorTexture: this.colorTexture
       };
@@ -168,7 +168,8 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
                 primitive: _l7Core.gl.TRIANGLES,
                 depth: {
                   enable: false
-                }
+                },
+                pickingEnabled: false
               });
             case 13:
               model = _context3.sent;

package/lib/raster/models/rasterRgb.js

@@ -25,7 +25,7 @@ var _excluded = ["data"],
 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/rgb/raster_rgb_frag.glsl' */
-var rasterFrag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n vec2 u_rminmax;\n vec2 u_gminmax;\n vec2 u_bminmax;\n float u_opacity;\n float u_noDataValue;\n};\n\nin vec2 v_texCoord;\n\nout vec4 outputColor;\n\nvoid main() {\n\n  vec3 rgb = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y)).rgb;\n\n  if(rgb == vec3(u_noDataValue)) {\n    outputColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    outputColor = 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(outputColor.a < 0.01)\n    discard;\n \n}";
+var rasterFrag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n vec2 u_rminmax;\n vec2 u_gminmax;\n vec2 u_bminmax;\n float u_opacity;\n float u_noDataValue;\n};\n\nin vec2 v_texCoord;\n\nout vec4 outputColor;\n\nvoid main() {\n\n  vec3 rgb = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y)).rgb;\n\n  if(rgb == vec3(u_noDataValue)) {\n    outputColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    outputColor = 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  if(outputColor.a < 0.01)\n    discard;\n \n}";
 /* babel-plugin-inline-import '../shaders/rgb/raster_rgb_vert.glsl' */
 var rasterVert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n vec2 u_rminmax;\n vec2 u_gminmax;\n vec2 u_bminmax;\n float u_opacity;\n float u_noDataValue;\n};\n\nout vec2 v_texCoord;\n\n#pragma include \"projection\"\n\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_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
 var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
@@ -159,7 +159,8 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
                 primitive: _l7Core.gl.TRIANGLES,
                 depth: {
                   enable: false
-                }
+                },
+                pickingEnabled: false
               });
             case 13:
               model = _context2.sent;

package/lib/raster/models/rasterTerrainRgb.js

@@ -16,12 +16,13 @@ var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 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/terrain/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;\nuniform vec4 u_unpack;\n\nfloat getElevation(vec2 coord, float bias) {\n    // Convert encoded elevation value to meters\n    vec4 data = texture2D(u_texture, coord,bias) * 255.0;\n    data.a = -1.0;\n    return dot(data, u_unpack);\n}\n\nvec4 getColor(float value) {\n   float normalisedValue =(value- u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec2 coord = vec2(normalisedValue, 0);\n    return texture2D(u_colorTexture, coord);\n}\n\nvoid main() {\n  float value = getElevation(v_texCoord,0.0);\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   \n    gl_FragColor = getColor(value);\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n      if(gl_FragColor.a < 0.01)\n      discard;\n  }\n}\n";
+var Raster_terrainFrag = "uniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nlayout(std140) uniform commonUniforms {\n vec4 u_unpack;\n vec2 u_domain;\n float u_opacity;\n float u_noDataValue;\n float u_clampLow;\n float u_clampHigh;\n};\n\nin vec2 v_texCoord;\nout vec4 outputColor;\n\n\nfloat getElevation(vec2 coord, float bias) {\n    // Convert encoded elevation value to meters\n    vec4 data =  texture(SAMPLER_2D(u_texture), coord,bias) * 255.0;\n    data.a = -1.0;\n    return dot(data, u_unpack);\n}\n\nvec4 getColor(float value) {\n   float normalisedValue =(value- u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec2 coord = vec2(normalisedValue, 0);\n    return  texture(SAMPLER_2D(u_colorTexture), coord);\n}\n\nvoid main() {\n  float value = getElevation(v_texCoord,0.0);\n  if (value == u_noDataValue) {\n    outputColor = vec4(0.0, 0, 0, 0.0);\n  } else if ((u_clampLow < 0.5 && value < u_domain[0]) || (u_clampHigh < 0.5 && value > u_domain[1])) {\n     outputColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n   \n    outputColor = getColor(value);\n    outputColor.a =  outputColor.a * u_opacity ;\n      if(outputColor.a < 0.01)\n      discard;\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/terrain/terrain_rgb_vert.glsl' */
-var Raster_terrainVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\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_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
+var Raster_terrainVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n   vec4 u_unpack;\n   vec2 u_domain;\n   float u_opacity;\n   float u_noDataValue;\n   float u_clampLow;\n   float u_clampHigh;\n};\nout vec2 v_texCoord;\n#pragma include \"projection\"\n\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_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
 var RasterTerrainRGB = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(RasterTerrainRGB, _BaseModel);
   var _super = _createSuper(RasterTerrainRGB);
@@ -30,8 +31,8 @@ var RasterTerrainRGB = exports.default = /*#__PURE__*/function (_BaseModel) {
     return _super.apply(this, arguments);
   }
   (0, _createClass2.default)(RasterTerrainRGB, [{
-    key: "getUninforms",
-    value: function getUninforms() {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref = this.layer.getLayerConfig(),
         opacity = _ref.opacity,
         _ref$clampLow = _ref.clampLow,
@@ -58,16 +59,19 @@ var RasterTerrainRGB = exports.default = /*#__PURE__*/function (_BaseModel) {
       } else {
         this.layer.textureService.setColorTexture(colorTexture, rampColors, newdomain);
       }
-      return {
-        u_opacity: opacity || 1,
-        u_texture: this.texture,
+      var commonOptions = {
+        u_unpack: [rScaler, gScaler, bScaler, offset],
         u_domain: newdomain,
+        u_opacity: opacity || 1,
+        u_noDataValue: noDataValue,
         u_clampLow: clampLow,
         u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
-        u_noDataValue: noDataValue,
-        u_unpack: [rScaler, gScaler, bScaler, offset],
+        u_texture: this.texture,
         u_colorTexture: texture
       };
+      this.textures = [this.texture, texture];
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "initModels",
@@ -77,11 +81,12 @@ var RasterTerrainRGB = exports.default = /*#__PURE__*/function (_BaseModel) {
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              this.initUniformsBuffer();
               source = this.layer.getSource();
               createTexture2D = this.rendererService.createTexture2D;
-              _context.next = 4;
+              _context.next = 5;
               return source.data.images;
-            case 4:
+            case 5:
               imageData = _context.sent;
               this.texture = createTexture2D({
                 data: imageData[0],
@@ -90,7 +95,7 @@ var RasterTerrainRGB = exports.default = /*#__PURE__*/function (_BaseModel) {
                 min: _l7Core.gl.LINEAR,
                 mag: _l7Core.gl.LINEAR
               });
-              _context.next = 8;
+              _context.next = 9;
               return this.layer.buildLayerModel({
                 moduleName: 'RasterTileDataImage',
                 vertexShader: Raster_terrainVert,
@@ -101,10 +106,10 @@ var RasterTerrainRGB = exports.default = /*#__PURE__*/function (_BaseModel) {
                   enable: false
                 }
               });
-            case 8:
+            case 9:
               model = _context.sent;
               return _context.abrupt("return", [model]);
-            case 10:
+            case 11:
             case "end":
               return _context.stop();
           }
@@ -148,6 +153,7 @@ var RasterTerrainRGB = exports.default = /*#__PURE__*/function (_BaseModel) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
           buffer: {
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],

package/lib/raster/shaders/raster/raster_2d_frag.glsl

@@ -2,8 +2,8 @@ layout(std140) uniform commonUniforms {
   vec2 u_domain;
   float u_opacity;
   float u_noDataValue;
-  bool u_clampLow;
-  bool u_clampHigh;
+  float u_clampLow;
+  float u_clampHigh;
 };
 
 uniform sampler2D u_rasterTexture;
@@ -20,7 +20,7 @@ void main() {
   float value = texture(SAMPLER_2D(u_rasterTexture), vec2(v_texCoord.x, v_texCoord.y)).r;
   if (value == u_noDataValue || isnan_emu(value)) {
     discard;
-  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {
+  } else if ((u_clampLow < 0.5 && value < u_domain[0]) || (u_clampHigh < 0.5 && value > u_domain[1])) {
     discard;
   } else {
     float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);

package/lib/raster/shaders/raster/raster_2d_vert.glsl

@@ -6,8 +6,8 @@ layout(std140) uniform commonUniforms {
   vec2 u_domain;
   float u_opacity;
   float u_noDataValue;
-  bool u_clampLow;
-  bool u_clampHigh;
+  float u_clampLow;
+  float u_clampHigh;
 };
 
 out vec2 v_texCoord;

package/lib/raster/shaders/rgb/raster_rgb_frag.glsl

@@ -20,6 +20,7 @@ void main() {
   } else {
     outputColor = 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(outputColor.a < 0.01)
     discard;
  

package/lib/raster/shaders/terrain/terrain_rgb_frag.glsl

@@ -1,20 +1,22 @@
-precision mediump float;
-uniform float u_opacity: 1.0;
-
 uniform sampler2D u_texture;
 uniform sampler2D u_colorTexture;
 
-varying vec2 v_texCoord;
+layout(std140) uniform commonUniforms {
+ vec4 u_unpack;
+ vec2 u_domain;
+ float u_opacity;
+ float u_noDataValue;
+ float u_clampLow;
+ float u_clampHigh;
+};
+
+in vec2 v_texCoord;
+out vec4 outputColor;
 
-uniform vec2 u_domain;
-uniform float u_noDataValue;
-uniform bool u_clampLow: true;
-uniform bool u_clampHigh: true;
-uniform vec4 u_unpack;
 
 float getElevation(vec2 coord, float bias) {
     // Convert encoded elevation value to meters
-    vec4 data = texture2D(u_texture, coord,bias) * 255.0;
+    vec4 data =  texture(SAMPLER_2D(u_texture), coord,bias) * 255.0;
     data.a = -1.0;
     return dot(data, u_unpack);
 }
@@ -22,20 +24,20 @@ float getElevation(vec2 coord, float bias) {
 vec4 getColor(float value) {
    float normalisedValue =(value- u_domain[0]) / (u_domain[1] - u_domain[0]);
     vec2 coord = vec2(normalisedValue, 0);
-    return texture2D(u_colorTexture, coord);
+    return  texture(SAMPLER_2D(u_colorTexture), coord);
 }
 
 void main() {
   float value = getElevation(v_texCoord,0.0);
   if (value == u_noDataValue) {
-    gl_FragColor = vec4(0.0, 0, 0, 0.0);
-  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {
-     gl_FragColor = vec4(0.0, 0, 0, 0.0);
+    outputColor = vec4(0.0, 0, 0, 0.0);
+  } else if ((u_clampLow < 0.5 && value < u_domain[0]) || (u_clampHigh < 0.5 && value > u_domain[1])) {
+     outputColor = vec4(0.0, 0, 0, 0.0);
   } else {
    
-    gl_FragColor = getColor(value);
-    gl_FragColor.a =  gl_FragColor.a * u_opacity ;
-      if(gl_FragColor.a < 0.01)
+    outputColor = getColor(value);
+    outputColor.a =  outputColor.a * u_opacity ;
+      if(outputColor.a < 0.01)
       discard;
   }
 }

package/lib/raster/shaders/terrain/terrain_rgb_vert.glsl

@@ -1,10 +1,17 @@
-precision highp float;
-uniform mat4 u_ModelMatrix;
+layout(location = 0) in vec3 a_Position;
+layout(location = 14) in vec2 a_Uv;
 
-attribute vec3 a_Position;
-attribute vec2 a_Uv;
-varying vec2 v_texCoord;
+layout(std140) uniform commonUniforms {
+   vec4 u_unpack;
+   vec2 u_domain;
+   float u_opacity;
+   float u_noDataValue;
+   float u_clampLow;
+   float u_clampHigh;
+};
+out vec2 v_texCoord;
 #pragma include "projection"
+
 void main() {
    v_texCoord = a_Uv;
    vec4 project_pos = project_position(vec4(a_Position, 1.0));

package/lib/tile/core/BaseLayer.js

@@ -211,7 +211,7 @@ var BaseTileLayer = exports.default = /*#__PURE__*/function () {
     value: function () {
       var _tileUpdate = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var _this3 = this;
-        var minZoom, maxZoom;
+        var minZoom, maxZoom, tiles;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -223,8 +223,7 @@ var BaseTileLayer = exports.default = /*#__PURE__*/function () {
             case 2:
               minZoom = this.parent.getMinZoom();
               maxZoom = this.parent.getMaxZoom();
-              _context2.next = 6;
-              return Promise.all(this.tilesetManager.tiles.filter(function (tile) {
+              tiles = this.tilesetManager.tiles.filter(function (tile) {
                 return tile.isLoaded;
               }) // 过滤未加载完成的
               .filter(function (tile) {
@@ -235,8 +234,9 @@ var BaseTileLayer = exports.default = /*#__PURE__*/function () {
               }) //
               .filter(function (tile) {
                 return tile.z >= minZoom && tile.z < maxZoom;
-              }) // 过滤不可见见
-              .map( /*#__PURE__*/function () {
+              }); // 过滤不可见见
+              _context2.next = 7;
+              return Promise.all(tiles.map( /*#__PURE__*/function () {
                 var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(tile) {
                   var tileInstance, tileLayer;
                   return _regenerator.default.wrap(function _callee$(_context) {
@@ -274,12 +274,12 @@ var BaseTileLayer = exports.default = /*#__PURE__*/function () {
                   return _ref.apply(this, arguments);
                 };
               }()));
-            case 6:
+            case 7:
               if (this.tilesetManager.isLoaded) {
                 // 将事件抛出，图层上可以使用瓦片
                 this.parent.emit('tiles-loaded', this.tilesetManager.currentTiles);
               }
-            case 7:
+            case 8:
             case "end":
               return _context2.stop();
           }

package/lib/tile/service/TilePickService.js

@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TilePickService = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -40,20 +42,41 @@ var TilePickService = exports.TilePickService = /*#__PURE__*/function () {
     }
   }, {
     key: "pick",
-    value: function pick(layer, target) {
-      var container = this.parent.getContainer();
-      var pickingService = container.get(_l7Core.TYPES.IPickingService);
-      if (layer.type === 'RasterLayer') {
-        var tile = this.tileLayerService.getVisibleTileBylngLat(target.lngLat);
-        if (tile && tile.getMainLayer() !== undefined) {
-          var pickLayer = tile.getMainLayer();
-          return pickLayer.layerPickService.pickRasterLayer(pickLayer, target, this.parent);
-        }
-        return false;
+    value: function () {
+      var _pick = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer, target) {
+        var container, pickingService, tile, pickLayer;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              container = this.parent.getContainer();
+              pickingService = container.get(_l7Core.TYPES.IPickingService);
+              if (!(layer.type === 'RasterLayer')) {
+                _context.next = 8;
+                break;
+              }
+              tile = this.tileLayerService.getVisibleTileBylngLat(target.lngLat);
+              if (!(tile && tile.getMainLayer() !== undefined)) {
+                _context.next = 7;
+                break;
+              }
+              pickLayer = tile.getMainLayer();
+              return _context.abrupt("return", pickLayer.layerPickService.pickRasterLayer(pickLayer, target, this.parent));
+            case 7:
+              return _context.abrupt("return", false);
+            case 8:
+              this.pickRender(target);
+              return _context.abrupt("return", pickingService.pickFromPickingFBO(layer, target));
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function pick(_x, _x2) {
+        return _pick.apply(this, arguments);
       }
-      this.pickRender(target);
-      return pickingService.pickFromPickingFBO(layer, target);
-    }
+      return pick;
+    }()
   }, {
     key: "selectFeature",
     value: function selectFeature(pickedColors) {

package/lib/tile/tile/Tile.js

@@ -111,7 +111,8 @@ var Tile = exports.default = /*#__PURE__*/function (_EventEmitter) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               mask = new _polygon.default({
-                visible: false,
+                name: 'mask',
+                visible: true,
                 enablePicking: false
               }).source({
                 type: 'FeatureCollection',
@@ -121,7 +122,7 @@ var Tile = exports.default = /*#__PURE__*/function (_EventEmitter) {
                   type: 'geojson',
                   featureId: 'id'
                 }
-              }).shape('fill').style({
+              }).shape('fill').color('#0f0').style({
                 opacity: 0.5
               });
               container = (0, _l7Core.createLayerContainer)(this.parent.sceneContainer);
@@ -145,7 +146,7 @@ var Tile = exports.default = /*#__PURE__*/function (_EventEmitter) {
         return _addTileMask.apply(this, arguments);
       }
       return addTileMask;
-    }()
+    }() // 全局 Mask
   }, {
     key: "addMask",
     value: function () {

package/lib/utils/load-image.js

@@ -0,0 +1,53 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadImage = loadImage;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+function loadImage(_x) {
+  return _loadImage.apply(this, arguments);
+}
+function _loadImage() {
+  _loadImage = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url) {
+    var response, imageBitmap, image;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!window.createImageBitmap) {
+            _context.next = 14;
+            break;
+          }
+          _context.next = 3;
+          return fetch(url);
+        case 3:
+          response = _context.sent;
+          _context.t0 = createImageBitmap;
+          _context.next = 7;
+          return response.blob();
+        case 7:
+          _context.t1 = _context.sent;
+          _context.next = 10;
+          return (0, _context.t0)(_context.t1);
+        case 10:
+          imageBitmap = _context.sent;
+          return _context.abrupt("return", imageBitmap);
+        case 14:
+          image = new window.Image();
+          return _context.abrupt("return", new Promise(function (res) {
+            image.onload = function () {
+              return res(image);
+            };
+            image.src = url;
+            image.crossOrigin = 'Anonymous';
+          }));
+        case 16:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _loadImage.apply(this, arguments);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.20.13",
+  "version": "2.20.15",
   "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.20.13",
-    "@antv/l7-maps": "2.20.13",
-    "@antv/l7-source": "2.20.13",
-    "@antv/l7-utils": "2.20.13",
+    "@antv/l7-core": "2.20.15",
+    "@antv/l7-maps": "2.20.15",
+    "@antv/l7-source": "2.20.15",
+    "@antv/l7-utils": "2.20.15",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -52,7 +52,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.20.13",
+    "@antv/l7-test-utils": "2.20.15",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "9487cca3bdd14eb2fc81b310e4eae5d30a30496f",
+  "gitHead": "283c12854a06cd2181552d6a9cf00d3e34bbd58e",
   "publishConfig": {
     "access": "public"
   }