@antv/l7-layers 2.20.14 → 2.20.15

package/es/core/TextureService.js

@@ -31,7 +31,8 @@ var TextureService = /*#__PURE__*/function () {
         data: new Uint8Array(imageData.data),
         width: imageData.width,
         height: imageData.height,
-        flipY: false
+        flipY: false,
+        unorm: true
       });
       this.colorTexture = texture;
       return texture;

package/es/plugins/ShaderUniformPlugin.js

@@ -75,15 +75,19 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
             data: data
           });
         }
-        // For WebGL1. regl
-        layer.models.forEach(function (model) {
-          model.addUniforms(_objectSpread(_objectSpread({}, uniforms), {}, {
-            // TODO: move these 2 uniforms to PixelPickingPlugin
-            u_PickingBuffer: layer.getLayerConfig().pickingBuffer || 0,
-            // Tip: 当前地图是否在拖动
-            u_shaderPick: Number(layer.getShaderPickStat())
-          }));
-        });
+
+        // For WebGL1. regl 
+        var platformString = _this.rendererService.queryVerdorInfo();
+        if (platformString === 'WebGL1') {
+          layer.models.forEach(function (model) {
+            model.addUniforms(_objectSpread(_objectSpread({}, uniforms), {}, {
+              // TODO: move these 2 uniforms to PixelPickingPlugin
+              u_PickingBuffer: layer.getLayerConfig().pickingBuffer || 0,
+              // Tip: 当前地图是否在拖动
+              u_shaderPick: Number(layer.getShaderPickStat())
+            }));
+          });
+        }
       });
     }
 

package/es/raster/models/raster.js

@@ -14,9 +14,9 @@ import BaseModel from "../../core/BaseModel";
 import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { RasterImageTriangulation } from "../../core/triangulation";
 /* 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 = /*#__PURE__*/function (_BaseModel) {
   _inherits(RasterModel, _BaseModel);
   var _super = _createSuper(RasterModel);
@@ -52,8 +52,8 @@ var RasterModel = /*#__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
       };
@@ -161,7 +161,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                 primitive: gl.TRIANGLES,
                 depth: {
                   enable: false
-                }
+                },
+                pickingEnabled: false
               });
             case 13:
               model = _context3.sent;

package/es/raster/models/rasterRgb.js

@@ -18,7 +18,7 @@ import BaseModel from "../../core/BaseModel";
 import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { RasterImageTriangulation } from "../../core/triangulation";
 /* 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 = /*#__PURE__*/function (_BaseModel) {
@@ -152,7 +152,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                 primitive: gl.TRIANGLES,
                 depth: {
                   enable: false
-                }
+                },
+                pickingEnabled: false
               });
             case 13:
               model = _context2.sent;

package/es/raster/models/rasterTerrainRgb.js

@@ -13,9 +13,9 @@ import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 import { ShaderLocation } from "../../core/CommonStyleAttribute";
 /* babel-plugin-inline-import '../shaders/terrain/terrain_rgb_frag.glsl' */
-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 bool u_clampLow;\n bool 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 && value < u_domain[0]) || (!u_clampHigh && 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";
+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 = "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 bool u_clampLow;\n bool u_clampHigh;\n\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 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 = /*#__PURE__*/function (_BaseModel) {
   _inherits(RasterTerrainRGB, _BaseModel);
   var _super = _createSuper(RasterTerrainRGB);

package/es/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/es/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/es/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/es/raster/shaders/terrain/terrain_rgb_frag.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;
 };
 
 in vec2 v_texCoord;
@@ -31,7 +31,7 @@ void main() {
   float value = getElevation(v_texCoord,0.0);
   if (value == u_noDataValue) {
     outputColor = vec4(0.0, 0, 0, 0.0);
-  } 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])) {
      outputColor = vec4(0.0, 0, 0, 0.0);
   } else {
    

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

@@ -2,13 +2,12 @@ layout(location = 0) in vec3 a_Position;
 layout(location = 14) in vec2 a_Uv;
 
 layout(std140) uniform commonUniforms {
- vec4 u_unpack;
- vec2 u_domain;
- float u_opacity;
- float u_noDataValue;
- bool u_clampLow;
- bool u_clampHigh;
-
+   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"

package/es/tile/core/BaseLayer.js

@@ -204,7 +204,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
     value: function () {
       var _tileUpdate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var _this3 = this;
-        var minZoom, maxZoom;
+        var minZoom, maxZoom, tiles;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -216,8 +216,7 @@ var BaseTileLayer = /*#__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) {
@@ -228,8 +227,9 @@ var BaseTileLayer = /*#__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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(tile) {
                   var tileInstance, tileLayer;
                   return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -267,12 +267,12 @@ var BaseTileLayer = /*#__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/core/TextureService.js

@@ -38,7 +38,8 @@ var TextureService = exports.default = /*#__PURE__*/function () {
         data: new Uint8Array(imageData.data),
         width: imageData.width,
         height: imageData.height,
-        flipY: false
+        flipY: false,
+        unorm: true
       });
       this.colorTexture = texture;
       return texture;

package/lib/plugins/ShaderUniformPlugin.js

@@ -81,15 +81,19 @@ var ShaderUniformPlugin = exports.default = (_dec = (0, _inversify.injectable)()
             data: data
           });
         }
-        // For WebGL1. regl
-        layer.models.forEach(function (model) {
-          model.addUniforms((0, _objectSpread2.default)((0, _objectSpread2.default)({}, uniforms), {}, {
-            // TODO: move these 2 uniforms to PixelPickingPlugin
-            u_PickingBuffer: layer.getLayerConfig().pickingBuffer || 0,
-            // Tip: 当前地图是否在拖动
-            u_shaderPick: Number(layer.getShaderPickStat())
-          }));
-        });
+
+        // For WebGL1. regl 
+        var platformString = _this.rendererService.queryVerdorInfo();
+        if (platformString === 'WebGL1') {
+          layer.models.forEach(function (model) {
+            model.addUniforms((0, _objectSpread2.default)((0, _objectSpread2.default)({}, uniforms), {}, {
+              // TODO: move these 2 uniforms to PixelPickingPlugin
+              u_PickingBuffer: layer.getLayerConfig().pickingBuffer || 0,
+              // Tip: 当前地图是否在拖动
+              u_shaderPick: Number(layer.getShaderPickStat())
+            }));
+          });
+        }
       });
     }
 

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

@@ -20,9 +20,9 @@ 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 = "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 bool u_clampLow;\n bool 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 && value < u_domain[0]) || (!u_clampHigh && 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";
+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 = "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 bool u_clampLow;\n bool u_clampHigh;\n\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 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);

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

@@ -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;
 };
 
 in vec2 v_texCoord;
@@ -31,7 +31,7 @@ void main() {
   float value = getElevation(v_texCoord,0.0);
   if (value == u_noDataValue) {
     outputColor = vec4(0.0, 0, 0, 0.0);
-  } 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])) {
      outputColor = vec4(0.0, 0, 0, 0.0);
   } else {
    

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

@@ -2,13 +2,12 @@ layout(location = 0) in vec3 a_Position;
 layout(location = 14) in vec2 a_Uv;
 
 layout(std140) uniform commonUniforms {
- vec4 u_unpack;
- vec2 u_domain;
- float u_opacity;
- float u_noDataValue;
- bool u_clampLow;
- bool u_clampHigh;
-
+   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"

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.20.14",
+  "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.14",
-    "@antv/l7-maps": "2.20.14",
-    "@antv/l7-source": "2.20.14",
-    "@antv/l7-utils": "2.20.14",
+    "@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.14",
+    "@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": "ad997ac14616fa503fec4022f1a1a48747524f87",
+  "gitHead": "283c12854a06cd2181552d6a9cf00d3e34bbd58e",
   "publishConfig": {
     "access": "public"
   }