@antv/l7-layers 2.14.6 → 2.14.7

package/es/core/TextureService.js

@@ -33,7 +33,7 @@ var TextureService = /*#__PURE__*/function () {
       var createTexture2D = this.rendererService.createTexture2D;
       var imageData = this.getColorRampBar(colorRamp, domain);
       var texture = createTexture2D({
-        data: imageData.data,
+        data: new Uint8Array(imageData.data),
         width: imageData.width,
         height: imageData.height,
         flipY: false

package/es/core/interface.d.ts

@@ -1,5 +1,5 @@
 import { IAnimateOption, IMapService, ITexture2D } from '@antv/l7-core';
-import { IColorRamp, IImagedata } from '@antv/l7-utils';
+import { IColorRamp } from '@antv/l7-utils';
 import { styleOffset } from '../core/BaseModel';
 import { anchorType } from '../utils/symbol-layout';
 export declare enum lineStyleType {
@@ -147,7 +147,6 @@ export interface IImageLayerStyleOptions extends IBaseLayerStyleOptions {
     clampLow?: boolean;
     clampHigh?: boolean;
     rampColors?: IColorRamp;
-    rampColorsData?: ImageData | IImagedata;
     colorTexture?: ITexture2D;
 }
 export interface ICityBuildLayerStyleOptions {
@@ -209,16 +208,23 @@ export interface IHeatMapLayerStyleOptions extends IBaseLayerStyleOptions {
     rampColors: IColorRamp;
     coverage?: number;
 }
-export interface IRasterLayerStyleOptions extends IBaseLayerStyleOptions {
+export interface IBaseRasterLayerStyleOptions extends IBaseLayerStyleOptions {
     colorTexture?: ITexture2D;
     domain: [number, number];
     noDataValue: number;
     clampLow: boolean;
     clampHigh: boolean;
     rampColors: IColorRamp;
-    rampColorsData?: ImageData | IImagedata;
+}
+export interface IRasterLayerStyleOptions extends IBaseRasterLayerStyleOptions {
     channelRMax?: number;
     channelGMax?: number;
     channelBMax?: number;
 }
+export interface IRasterTerrainLayerStyleOptions extends IBaseRasterLayerStyleOptions {
+    rScaler?: number;
+    gScaler?: number;
+    bScaler?: number;
+    offset?: number;
+}
 export {};

package/es/raster/models/rasterTerrainRgb.js

@@ -16,7 +16,7 @@ import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
 /* 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      if(gl_FragColor.a < 0.01)\n      discard;\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;\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";
 
 /* 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";
@@ -45,7 +45,15 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
           noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
           domain = _ref.domain,
           rampColors = _ref.rampColors,
-          colorTexture = _ref.colorTexture;
+          colorTexture = _ref.colorTexture,
+          _ref$rScaler = _ref.rScaler,
+          rScaler = _ref$rScaler === void 0 ? 6553.6 : _ref$rScaler,
+          _ref$gScaler = _ref.gScaler,
+          gScaler = _ref$gScaler === void 0 ? 25.6 : _ref$gScaler,
+          _ref$bScaler = _ref.bScaler,
+          bScaler = _ref$bScaler === void 0 ? 0.1 : _ref$bScaler,
+          _ref$offset = _ref.offset,
+          offset = _ref$offset === void 0 ? 10000 : _ref$offset;
 
       var newdomain = domain || getDefaultDomain(rampColors);
       var texture = colorTexture;
@@ -63,6 +71,7 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
         u_clampLow: clampLow,
         u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
         u_noDataValue: noDataValue,
+        u_unpack: [rScaler, gScaler, bScaler, offset],
         u_colorTexture: texture
       };
     }
@@ -85,7 +94,9 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
                 this.texture = createTexture2D({
                   data: imageData[0],
                   width: imageData[0].width,
-                  height: imageData[0].height
+                  height: imageData[0].height,
+                  min: gl.LINEAR,
+                  mag: gl.LINEAR
                 });
                 _context.next = 8;
                 return this.layer.buildLayerModel({

package/es/raster/shaders/raster_terrain_rgb_frag.glsl

@@ -10,22 +10,30 @@ 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;
+    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 texture2D(u_colorTexture, coord);
+}
 
 void main() {
-  vec4 baseColor = texture2D(u_texture, vec2(v_texCoord.x, v_texCoord.y)) * 256.0;
-  float r = baseColor.r * 256.0 * 256.0;
-  float g = baseColor.g * 256.0;
-  float b = baseColor.b;
-  float value =  (r + g + b) * 0.1 - 10000.0;
-  
+  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);
   } 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 = getColor(value);
     gl_FragColor.a =  gl_FragColor.a * u_opacity ;
       if(gl_FragColor.a < 0.01)
       discard;

package/lib/core/TextureService.js

@@ -44,7 +44,7 @@ var TextureService = /*#__PURE__*/function () {
       var createTexture2D = this.rendererService.createTexture2D;
       var imageData = this.getColorRampBar(colorRamp, domain);
       var texture = createTexture2D({
-        data: imageData.data,
+        data: new Uint8Array(imageData.data),
         width: imageData.width,
         height: imageData.height,
         flipY: false

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      if(gl_FragColor.a < 0.01)\n      discard;\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;\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";
 
 /* 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";
@@ -62,7 +62,15 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
           noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
           domain = _ref.domain,
           rampColors = _ref.rampColors,
-          colorTexture = _ref.colorTexture;
+          colorTexture = _ref.colorTexture,
+          _ref$rScaler = _ref.rScaler,
+          rScaler = _ref$rScaler === void 0 ? 6553.6 : _ref$rScaler,
+          _ref$gScaler = _ref.gScaler,
+          gScaler = _ref$gScaler === void 0 ? 25.6 : _ref$gScaler,
+          _ref$bScaler = _ref.bScaler,
+          bScaler = _ref$bScaler === void 0 ? 0.1 : _ref$bScaler,
+          _ref$offset = _ref.offset,
+          offset = _ref$offset === void 0 ? 10000 : _ref$offset;
 
       var newdomain = domain || (0, _l7Utils.getDefaultDomain)(rampColors);
       var texture = colorTexture;
@@ -80,6 +88,7 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
         u_clampLow: clampLow,
         u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
         u_noDataValue: noDataValue,
+        u_unpack: [rScaler, gScaler, bScaler, offset],
         u_colorTexture: texture
       };
     }
@@ -102,7 +111,9 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
                 this.texture = createTexture2D({
                   data: imageData[0],
                   width: imageData[0].width,
-                  height: imageData[0].height
+                  height: imageData[0].height,
+                  min: _l7Core.gl.LINEAR,
+                  mag: _l7Core.gl.LINEAR
                 });
                 _context.next = 8;
                 return this.layer.buildLayerModel({

package/lib/raster/shaders/raster_terrain_rgb_frag.glsl

@@ -10,22 +10,30 @@ 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;
+    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 texture2D(u_colorTexture, coord);
+}
 
 void main() {
-  vec4 baseColor = texture2D(u_texture, vec2(v_texCoord.x, v_texCoord.y)) * 256.0;
-  float r = baseColor.r * 256.0 * 256.0;
-  float g = baseColor.g * 256.0;
-  float b = baseColor.b;
-  float value =  (r + g + b) * 0.1 - 10000.0;
-  
+  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);
   } 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 = getColor(value);
     gl_FragColor.a =  gl_FragColor.a * u_opacity ;
       if(gl_FragColor.a < 0.01)
       discard;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.14.6",
+  "version": "2.14.7",
   "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.14.6",
-    "@antv/l7-maps": "2.14.6",
-    "@antv/l7-source": "2.14.6",
-    "@antv/l7-utils": "2.14.6",
+    "@antv/l7-core": "2.14.7",
+    "@antv/l7-maps": "2.14.7",
+    "@antv/l7-source": "2.14.7",
+    "@antv/l7-utils": "2.14.7",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -53,7 +53,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.14.6",
+    "@antv/l7-test-utils": "2.14.7",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -62,7 +62,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "5f8823a2b58da0d8bed10a23e21fc903458c1f77",
+  "gitHead": "66930cd0d38ec341382493065defb77911c38d15",
   "publishConfig": {
     "access": "public"
   }