@antv/l7-layers 2.21.10 → 2.21.11-beta.1

package/es/polygon/shaders/extrude/polygon_extrudetex_vert.glsl

@@ -1,9 +1,9 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
-layout(location = 13) in vec3 a_Normal;
-layout(location = 14) in vec3 a_uvs;
-
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
+layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec3 a_uvs;
 
 layout(std140) uniform commonUniforms {
   vec4 u_sourceColor;
@@ -24,31 +24,31 @@ out vec2 v_texture_data;
 #pragma include "picking"
 
 void main() {
- 
   vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);
-  float lightWeight = calc_lighting(pos);
-  vec4 project_pos = project_position(pos);
+  vec4 project_pos = project_position(pos, a_Position64Low);
+  float lightWeight = calc_lighting(project_pos);
   v_uvs = a_uvs;
   v_Color = a_Color;
   v_Color.a *= opacity;
-   
+
   v_texture_data = vec2(a_Position.z, lightWeight);
 
-  if(u_heightfixed > 0.0) { // 判断几何体是否固定高度
+  if (u_heightfixed > 0.0) {
+    // 判断几何体是否固定高度
     project_pos.z = a_Position.z * a_Size;
     project_pos.z += u_raisingHeight;
 
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
+    if (
+      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
+      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
+    ) {
+      float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);
       project_pos.z *= mapboxZoomScale;
       project_pos.z += u_raisingHeight * mapboxZoomScale;
     }
   }
 
-
-    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
-
-
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   setPickingColor(a_PickingColor);
 }

package/es/polygon/shaders/extrusion/polygon_extrusion_vert.glsl

@@ -1,7 +1,8 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
-layout(location = 13) in vec3 a_Normal;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
+layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;
 
 out vec4 v_Color;
 
@@ -10,15 +11,14 @@ out vec4 v_Color;
 #pragma include "picking"
 
 void main() {
- 
   vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase, 1.0);
 
-  vec4 project_pos = project_position(pos);
-   float lightWeight = calc_lighting(project_pos);
+  vec4 project_pos = project_position(pos, a_Position64Low);
+  float lightWeight = calc_lighting(project_pos);
   v_Color = a_Color;
   v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);
 
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   setPickingColor(a_PickingColor);
 }

package/es/polygon/shaders/fill/fill_linear_vert.glsl

@@ -1,6 +1,7 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 15) in vec3 a_linear;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_LINEAR) in vec3 a_linear;
 
 layout(std140) uniform commonUniforms {
   float u_raisingHeight;
@@ -21,7 +22,7 @@ void main() {
     v_pos = a_Position.xy;
   }
   v_color = vec4(a_Color.xyz, a_Color.w * opacity);
-  vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);
   project_pos.z += u_raisingHeight;
 
   if (u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
@@ -30,6 +31,6 @@ void main() {
     project_pos.z += u_raisingHeight * mapboxZoomScale;
   }
 
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
   setPickingColor(a_PickingColor);
-}
+}

package/es/polygon/shaders/fill/fill_vert.glsl

@@ -1,36 +1,34 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
 
 layout(std140) uniform commonUniforms {
   float u_raisingHeight;
 };
 
-
 out vec4 v_color;
 
-
 #pragma include "projection"
 #pragma include "picking"
 
 void main() {
   // cal style mapping - 数据纹理映射部分的计算
 
-  // cal style mapping - 数据纹理映射部分的计算
-
   v_color = vec4(a_Color.xyz, a_Color.w * opacity);
-  vec4 project_pos = project_position(vec4(a_Position, 1.0));
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);
 
   project_pos.z += u_raisingHeight;
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
+  if (
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
+  ) {
+    float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);
     project_pos.z *= mapboxZoomScale;
     project_pos.z += u_raisingHeight * mapboxZoomScale;
   }
 
- 
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   setPickingColor(a_PickingColor);
 }

package/es/polygon/shaders/ocean/ocean_vert.glsl

@@ -1,5 +1,5 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 14) in vec2 a_uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_uv;
 
 layout(std140) uniform commonUniforms {
   vec4 u_watercolor;
@@ -7,7 +7,6 @@ layout(std140) uniform commonUniforms {
   float u_time;
 };
 
-
 out vec2 v_uv;
 out float v_opacity;
 
@@ -17,6 +16,6 @@ void main() {
   v_uv = a_uv;
   v_opacity = opacity;
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 }
 

package/es/polygon/shaders/water/polygon_water_vert.glsl

@@ -1,6 +1,7 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 14) in vec2 a_uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_uv;
+
 layout(std140) uniform commonUniforms {
   float u_speed;
   float u_time;
@@ -8,7 +9,6 @@ layout(std140) uniform commonUniforms {
 out vec4 v_Color;
 out vec2 v_uv;
 
-
 #pragma include "projection"
 
 void main() {
@@ -17,6 +17,6 @@ void main() {
   v_Color.a *= opacity;
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
 
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 }
 

package/es/raster/index.d.ts

@@ -2,7 +2,7 @@ import type { ILegend } from '@antv/l7-core';
 import BaseLayer from '../core/BaseLayer';
 import type { IRasterLayerStyleOptions } from '../core/interface';
 import type { RasterModelType } from './models/index';
-export default class RaterLayer extends BaseLayer<IRasterLayerStyleOptions> {
+export default class RasterLayer extends BaseLayer<IRasterLayerStyleOptions> {
     type: string;
     buildModels(): Promise<void>;
     protected getDefaultConfig(): {} | {} | {} | {};

package/es/raster/index.js

@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import BaseLayer from "../core/BaseLayer";
 import { rampColor2legend } from "../utils/rampcolor_legend";
 import RasterModels from "./models/index";
-export default class RaterLayer extends BaseLayer {
+export default class RasterLayer extends BaseLayer {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "type", 'RasterLayer');

package/es/raster/models/raster.d.ts

@@ -1,6 +1,20 @@
 import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class RasterModel extends BaseModel {
+    protected get attributeLocation(): {
+        readonly POSITION: 0;
+        readonly POSITION_64LOW: 1;
+        readonly COLOR: 2;
+        readonly PICKING_COLOR: 3;
+        readonly STROKE: 4;
+        readonly OPACITY: 5;
+        readonly OFFSETS: 6;
+        readonly ROTATION: 7;
+        readonly MAX: 8;
+    } & Record<string, number> & {
+        MAX: 8;
+        UV: number;
+    };
     protected texture: ITexture2D;
     protected colorTexture: ITexture2D;
     getUninforms(): {

package/es/raster/models/raster.js

@@ -4,18 +4,23 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, gl } from '@antv/l7-core';
 import { getDefaultDomain } from '@antv/l7-utils';
 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' */
 const 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' */
-const 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";
+const rasterVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;\nlayout(location = ATTRIBUTE_LOCATION_UV) 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), a_Position64Low);\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));\n}\n";
 export default class RasterModel extends BaseModel {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "texture", void 0);
     _defineProperty(this, "colorTexture", void 0);
   }
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      UV: 9
+    });
+  }
   getUninforms() {
     const commoninfo = this.getCommonUniformsInfo();
     const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -98,6 +103,7 @@ export default class RasterModel extends BaseModel {
         height,
         /**
          * WebGL1 allow the combination of gl.LUMINANCE & gl.FLOAT with OES_texture_float
+         * TODO: https://github.com/antvis/g-device-api/issues/188
          */
         format: queryVerdorInfo() === 'WebGL1' ? gl.LUMINANCE : gl.RED,
         type: gl.FLOAT,
@@ -107,6 +113,7 @@ export default class RasterModel extends BaseModel {
         moduleName: 'rasterImageData',
         vertexShader: rasterVert,
         fragmentShader: rasterFrag,
+        defines: _this2.getDefines(),
         triangulation: RasterImageTriangulation,
         primitive: gl.TRIANGLES,
         depth: {
@@ -123,12 +130,15 @@ export default class RasterModel extends BaseModel {
     (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 || _this$colorTexture.destroy();
   }
   registerBuiltinAttributes() {
+    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 22 层级以上出现数据偏移
+    this.registerPosition64LowAttribute();
+
     // point layer size;
     this.styleAttributeService.registerStyleAttribute({
       name: 'uv',
       type: AttributeType.Attribute,
       descriptor: {
-        shaderLocation: ShaderLocation.UV,
+        shaderLocation: this.attributeLocation.UV,
         name: 'a_Uv',
         buffer: {
           // give the WebGL driver a hint that this buffer may change

package/es/raster/models/rasterRgb.d.ts

@@ -1,6 +1,20 @@
 import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class RasterModel extends BaseModel {
+    protected get attributeLocation(): {
+        readonly POSITION: 0;
+        readonly POSITION_64LOW: 1;
+        readonly COLOR: 2;
+        readonly PICKING_COLOR: 3;
+        readonly STROKE: 4;
+        readonly OPACITY: 5;
+        readonly OFFSETS: 6;
+        readonly ROTATION: 7;
+        readonly MAX: 8;
+    } & Record<string, number> & {
+        MAX: 8;
+        UV: number;
+    };
     protected texture: ITexture2D;
     protected dataOption: any;
     getUninforms(): {

package/es/raster/models/rasterRgb.js

@@ -6,18 +6,23 @@ const _excluded = ["data"],
   _excluded2 = ["rasterData"];
 import { AttributeType, gl } from '@antv/l7-core';
 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' */
 const 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' */
-const 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";
+const rasterVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;\nlayout(location = ATTRIBUTE_LOCATION_UV) 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), a_Position64Low);\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));\n}\n";
 export default class RasterModel extends BaseModel {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "texture", void 0);
     _defineProperty(this, "dataOption", {});
   }
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      UV: 9
+    });
+  }
   getUninforms() {
     const commoninfo = this.getCommonUniformsInfo();
     const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
@@ -105,6 +110,7 @@ export default class RasterModel extends BaseModel {
         moduleName: 'rasterImageDataRGBA',
         vertexShader: rasterVert,
         fragmentShader: rasterFrag,
+        defines: _this2.getDefines(),
         triangulation: RasterImageTriangulation,
         primitive: gl.TRIANGLES,
         depth: {
@@ -126,13 +132,16 @@ export default class RasterModel extends BaseModel {
     (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
   }
   registerBuiltinAttributes() {
+    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 22 层级以上出现数据偏移
+    this.registerPosition64LowAttribute();
+
     // point layer size;
     this.styleAttributeService.registerStyleAttribute({
       name: 'uv',
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: ShaderLocation.UV,
+        shaderLocation: this.attributeLocation.UV,
         buffer: {
           // give the WebGL driver a hint that this buffer may change
           usage: gl.DYNAMIC_DRAW,

package/es/raster/models/rasterTerrainRgb.d.ts

@@ -1,6 +1,20 @@
 import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class RasterTerrainRGB extends BaseModel {
+    protected get attributeLocation(): {
+        readonly POSITION: 0;
+        readonly POSITION_64LOW: 1;
+        readonly COLOR: 2;
+        readonly PICKING_COLOR: 3;
+        readonly STROKE: 4;
+        readonly OPACITY: 5;
+        readonly OFFSETS: 6;
+        readonly ROTATION: 7;
+        readonly MAX: 8;
+    } & Record<string, number> & {
+        MAX: 8;
+        UV: number;
+    };
     protected texture: ITexture2D;
     protected getCommonUniformsInfo(): {
         uniformsArray: number[];

package/es/raster/models/rasterTerrainRgb.js

@@ -3,17 +3,22 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, gl } from '@antv/l7-core';
 import { getDefaultDomain } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
-import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { RasterImageTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/terrain/terrain_rgb_frag.glsl' */
 const 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' */
-const 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";
+const Raster_terrainVert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\nlayout(location = ATTRIBUTE_LOCATION_UV) 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(vec4(project_pos.xy, 0.0, 1.0));\n}\n";
 export default class RasterTerrainRGB extends BaseModel {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "texture", void 0);
   }
+  get attributeLocation() {
+    return Object.assign(super.attributeLocation, {
+      MAX: super.attributeLocation.MAX,
+      UV: 9
+    });
+  }
   getCommonUniformsInfo() {
     const {
       opacity,
@@ -69,6 +74,7 @@ export default class RasterTerrainRGB extends BaseModel {
         moduleName: 'RasterTileDataImage',
         vertexShader: Raster_terrainVert,
         fragmentShader: Raster_terrainFrag,
+        defines: _this.getDefines(),
         triangulation: RasterImageTriangulation,
         primitive: gl.TRIANGLES,
         depth: {
@@ -89,12 +95,14 @@ export default class RasterTerrainRGB extends BaseModel {
     })();
   }
   registerBuiltinAttributes() {
+    // 注册 Position 属性 64 位地位部分，经纬度数据开启双精度，避免大于 22 层级以上出现数据偏移
+    this.registerPosition64LowAttribute();
     this.styleAttributeService.registerStyleAttribute({
       name: 'uv',
       type: AttributeType.Attribute,
       descriptor: {
         name: 'a_Uv',
-        shaderLocation: ShaderLocation.UV,
+        shaderLocation: this.attributeLocation.UV,
         buffer: {
           usage: gl.DYNAMIC_DRAW,
           data: [],

package/es/raster/shaders/raster/raster_2d_vert.glsl

@@ -1,6 +1,6 @@
-
-layout(location = 0) in vec3 a_Position;
-layout(location = 14) in vec2 a_Uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
 
 layout(std140) uniform commonUniforms {
   vec2 u_domain;
@@ -15,7 +15,7 @@ out vec2 v_texCoord;
 #pragma include "projection"
 
 void main() {
-   v_texCoord = a_Uv;
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
+  v_texCoord = a_Uv;
+  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
 }

package/es/raster/shaders/rgb/raster_rgb_vert.glsl

@@ -1,13 +1,13 @@
-
-layout(location = 0) in vec3 a_Position;
-layout(location = 14) in vec2 a_Uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION_64LOW) in vec2 a_Position64Low;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
 
 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;
 };
 
 out vec2 v_texCoord;
@@ -15,7 +15,7 @@ out vec2 v_texCoord;
 #pragma include "projection"
 
 void main() {
-   v_texCoord = a_Uv;
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
+  v_texCoord = a_Uv;
+  vec4 project_pos = project_position(vec4(a_Position, 1.0), a_Position64Low);
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
 }

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

@@ -1,19 +1,19 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 14) in vec2 a_Uv;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_Uv;
 
 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;
 };
 out vec2 v_texCoord;
 #pragma include "projection"
 
 void main() {
-   v_texCoord = a_Uv;
-   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
+  v_texCoord = a_Uv;
+  vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0.0, 1.0));
 }

package/es/tile/core/BaseLayer.js

@@ -32,22 +32,6 @@ export default class BaseTileLayer {
         latLonBounds,
         zoom
       } = this.getCurrentView();
-      if (this.mapService.version === 'GAODE1.x') {
-        const {
-          visible
-        } = this.parent.getLayerConfig();
-        if (zoom < 2 && visible) {
-          this.parent.updateLayerConfig({
-            visible: false
-          });
-          this.layerService.reRender();
-        } else if (zoom >= 2 && !visible) {
-          this.parent.updateLayerConfig({
-            visible: true
-          });
-          this.layerService.reRender();
-        }
-      }
       if (this.lastViewStates && this.lastViewStates.zoom === zoom && this.lastViewStates.latLonBounds.toString() === latLonBounds.toString()) {
         return;
       }

package/es/utils/extrude_polyline.d.ts

@@ -39,20 +39,6 @@ export default class ExtrudePolyline {
         startIndex: number;
         indexes: number[];
     };
-    simpleExtrude_gaode2(points: number[][], originPoints: number[][]): {
-        positions: number[];
-        indices: number[];
-        normals: number[];
-        startIndex: number;
-        indexes: number[];
-    };
-    extrude_gaode2(points: number[][], originPoints: number[][]): {
-        positions: number[];
-        indices: number[];
-        normals: number[];
-        startIndex: number;
-        indexes: number[];
-    };
     extrude(points: number[][]): {
         positions: number[];
         indices: number[];
@@ -61,7 +47,6 @@ export default class ExtrudePolyline {
         indexes: number[];
     };
     private simpleSegment;
-    private segment_gaode2;
     private segment;
     private extrusions;
     private lineSegmentDistance;