@antv/l7-layers 2.22.5 → 2.22.7

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

@@ -11,7 +11,11 @@ uniform sampler2D u_colorTexture;
 
 in vec2 v_texCoord;
 
-bool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }
+bool isnan_emu(float x) {
+  return x > 0.0 || x < 0.0
+    ? x != x
+    : x != 0.0;
+}
 
 out vec4 outputColor;
 
@@ -20,15 +24,14 @@ 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 < 0.5 && value < u_domain[0]) || (u_clampHigh < 0.5 && 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]);
+    float normalisedValue = (value - u_domain[0]) / (u_domain[1] - u_domain[0]);
     vec4 color = texture(SAMPLER_2D(u_colorTexture), vec2(normalisedValue, 0));
-    
+
     outputColor = color;
-    outputColor.a = outputColor.a * u_opacity ;
-    if (outputColor.a < 0.01)
-      discard;
+    outputColor.a = outputColor.a * u_opacity;
+    if (outputColor.a < 0.01) discard;
   }
 }

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

@@ -1,10 +1,10 @@
 uniform sampler2D u_texture;
 layout(std140) uniform commonUniforms {
- vec2 u_rminmax;
- vec2 u_gminmax;
- vec2 u_bminmax;
- float u_opacity;
- float u_noDataValue;
+  vec2 u_rminmax;
+  vec2 u_gminmax;
+  vec2 u_bminmax;
+  float u_opacity;
+  float u_noDataValue;
 };
 
 in vec2 v_texCoord;
@@ -12,16 +12,19 @@ in vec2 v_texCoord;
 out vec4 outputColor;
 
 void main() {
+  vec3 rgb = texture(SAMPLER_2D(u_texture), vec2(v_texCoord.x, v_texCoord.y)).rgb;
 
-  vec3 rgb = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y)).rgb;
-
-  if(rgb == vec3(u_noDataValue)) {
+  if (rgb == vec3(u_noDataValue)) {
     outputColor = vec4(0.0, 0, 0, 0.0);
   } 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);
+    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;
- 
-}
+  if (outputColor.a < 0.01) discard;
+
+}

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

@@ -2,42 +2,39 @@ uniform sampler2D u_texture;
 uniform sampler2D u_colorTexture;
 
 layout(std140) uniform commonUniforms {
- vec4 u_unpack;
- vec2 u_domain;
- float u_opacity;
- float u_noDataValue;
- float u_clampLow;
- float u_clampHigh;
+  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;
 
-
 float getElevation(vec2 coord, float bias) {
-    // Convert encoded elevation value to meters
-    vec4 data =  texture(SAMPLER_2D(u_texture), coord,bias) * 255.0;
-    data.a = -1.0;
-    return dot(data, u_unpack);
+  // Convert encoded elevation value to meters
+  vec4 data = texture(SAMPLER_2D(u_texture), coord, bias) * 255.0;
+  data.a = -1.0;
+  return dot(data, u_unpack);
 }
 
 vec4 getColor(float value) {
-   float normalisedValue =(value- u_domain[0]) / (u_domain[1] - u_domain[0]);
-    vec2 coord = vec2(normalisedValue, 0);
-    return  texture(SAMPLER_2D(u_colorTexture), coord);
+  float normalisedValue = (value - u_domain[0]) / (u_domain[1] - u_domain[0]);
+  vec2 coord = vec2(normalisedValue, 0);
+  return texture(SAMPLER_2D(u_colorTexture), coord);
 }
 
 void main() {
-  float value = getElevation(v_texCoord,0.0);
+  float value = getElevation(v_texCoord, 0.0);
   if (value == u_noDataValue) {
     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 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 {
-   
     outputColor = getColor(value);
-    outputColor.a =  outputColor.a * u_opacity ;
-      if(outputColor.a < 0.01)
-      discard;
+    outputColor.a = outputColor.a * u_opacity;
+    if (outputColor.a < 0.01) discard;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.22.5",
+  "version": "2.22.7",
   "description": "L7's collection of built-in layers",
   "license": "MIT",
   "author": "https://github.com/orgs/antvis/people",
@@ -33,10 +33,10 @@
     "gl-matrix": "^3.1.0",
     "gl-vec2": "^1.3.0",
     "polyline-miter-util": "^1.0.1",
-    "@antv/l7-core": "2.22.5",
-    "@antv/l7-maps": "2.22.5",
-    "@antv/l7-source": "2.22.5",
-    "@antv/l7-utils": "2.22.5"
+    "@antv/l7-core": "2.22.7",
+    "@antv/l7-maps": "2.22.7",
+    "@antv/l7-utils": "2.22.7",
+    "@antv/l7-source": "2.22.7"
   },
   "devDependencies": {
     "@types/d3-array": "^2",
@@ -45,7 +45,7 @@
     "@types/d3-scale": "^2.1.1",
     "@types/earcut": "^2.1.0",
     "@types/gl-matrix": "^2.4.5",
-    "@antv/l7-test-utils": "^2.22.5"
+    "@antv/l7-test-utils": "^2.22.7"
   },
   "publishConfig": {
     "access": "public",