@antv/l7-layers 2.21.9 → 2.21.11-beta.0

package/es/line/shaders/greatCircle/line_arc_great_circle_vert.glsl

@@ -1,13 +1,14 @@
-#define LineTypeSolid 0.0
-#define LineTypeDash 1.0
-#define Animate 0.0
-#define LineTexture 1.0
-
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
-layout(location = 12) in vec4 a_Instance;
-layout(location = 14) in vec2 a_iconMapUV;
+#define LineTypeSolid (0.0)
+#define LineTypeDash (1.0)
+#define Animate (0.0)
+#define LineTexture (1.0)
+
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
+layout(location = ATTRIBUTE_LOCATION_SIZE) in float a_Size;
+layout(location = ATTRIBUTE_LOCATION_INSTANCE) in vec4 a_Instance;
+layout(location = ATTRIBUTE_LOCATION_INSTANCE_64LOW) in vec4 a_Instance64Low;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_iconMapUV;
 
 layout(std140) uniform commonUniorm {
   vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
@@ -34,12 +35,12 @@ out float v_distance_ratio;
 #pragma include "project"
 #pragma include "picking"
 
-float maps (float value, float start1, float stop1, float start2, float stop2) {
+float maps(float value, float start1, float stop1, float start2, float stop2) {
   return start2 + (stop2 - start2) * ((value - start1) / (stop1 - start1));
 }
 
 float getSegmentRatio(float index) {
-  return index / (segmentNumber - 1.);
+  return index / (segmentNumber - 1.0);
 }
 
 float paraboloid(vec2 source, vec2 target, float ratio) {
@@ -53,33 +54,29 @@ float paraboloid(vec2 source, vec2 target, float ratio) {
 vec3 getPos(vec2 source, vec2 target, float segmentRatio) {
   float vertex_height = paraboloid(source, target, segmentRatio);
 
-  return vec3(
-  mix(source, target, segmentRatio),
-  sqrt(max(0.0, vertex_height))
-  );
+  return vec3(mix(source, target, segmentRatio), sqrt(max(0.0, vertex_height)));
 }
 vec2 getExtrusionOffset(vec2 line_clipspace, float offset_direction) {
   // normalized direction of the line
   vec2 dir_screenspace = normalize(line_clipspace);
   // rotate by 90 degrees
-   dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
-  vec2 offset = dir_screenspace * offset_direction * setPickingSize(a_Size)/ 2.0;
+  dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
+  vec2 offset = dir_screenspace * offset_direction * setPickingSize(a_Size) / 2.0;
   return offset;
 }
 vec2 getNormal(vec2 line_clipspace, float offset_direction) {
   // normalized direction of the line
   vec2 dir_screenspace = normalize(line_clipspace);
   // rotate by 90 degrees
-   dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
-   return reverse_offset_normal(vec3(dir_screenspace,1.0)).xy * sign(offset_direction);
+  dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
+  return dir_screenspace.xy * sign(offset_direction);
 }
-float getAngularDist (vec2 source, vec2 target) {
+float getAngularDist(vec2 source, vec2 target) {
   vec2 delta = source - target;
   vec2 sin_half_delta = sin(delta / 2.0);
   float a =
     sin_half_delta.y * sin_half_delta.y +
-    cos(source.y) * cos(target.y) *
-    sin_half_delta.x * sin_half_delta.x;
+    cos(source.y) * cos(target.y) * sin_half_delta.x * sin_half_delta.x;
   return 2.0 * atan(sqrt(a), sqrt(1.0 - a));
 }
 
@@ -90,37 +87,29 @@ vec2 midPoint(vec2 source, vec2 target) {
   float thetaOffset = 0.314;
   float r2 = r / 2.0 / cos(thetaOffset);
   float theta2 = theta + thetaOffset;
-  vec2 mid = vec2(r2*cos(theta2) + source.x, r2*sin(theta2) + source.y);
+  vec2 mid = vec2(r2 * cos(theta2) + source.x, r2 * sin(theta2) + source.y);
   return mid;
 }
 float bezier3(vec3 arr, float t) {
-  float ut = 1. - t;
+  float ut = 1.0 - t;
   return (arr.x * ut + arr.y * t) * ut + (arr.y * ut + arr.z * t) * t;
 }
 
-vec2 interpolate (vec2 source, vec2 target, float angularDist, float t) {
-  // if the angularDist is PI, linear interpolation is applied. otherwise, use spherical interpolation
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    vec2 mid = midPoint(source, target);
-    vec3 x = vec3(source.x, mid.x, target.x);
-    vec3 y = vec3(source.y, mid.y, target.y);
-    return vec2(bezier3(x ,t), bezier3(y,t));
-  }
-  else {
-    if(abs(angularDist - PI) < 0.001) {
-      return (1.0 - t) * source + t * target;
-    }
-    float a = sin((1.0 - t) * angularDist) / sin(angularDist);
-    float b = sin(t * angularDist) / sin(angularDist);
-    vec2 sin_source = sin(source);
-    vec2 cos_source = cos(source);
-    vec2 sin_target = sin(target);
-    vec2 cos_target = cos(target);
-    float x = a * cos_source.y * cos_source.x + b * cos_target.y * cos_target.x;
-    float y = a * cos_source.y * sin_source.x + b * cos_target.y * sin_target.x;
-    float z = a * sin_source.y + b * sin_target.y;
-    return vec2(atan(y, x), atan(z, sqrt(x * x + y * y)));
+vec2 interpolate(vec2 source, vec2 target, float angularDist, float t) {
+  if (abs(angularDist - PI) < 0.001) {
+    return (1.0 - t) * source + t * target;
   }
+  float a = sin((1.0 - t) * angularDist) / sin(angularDist);
+  float b = sin(t * angularDist) / sin(angularDist);
+  vec2 sin_source = sin(source);
+  vec2 cos_source = cos(source);
+  vec2 sin_target = sin(target);
+  vec2 cos_target = cos(target);
+  float x = a * cos_source.y * cos_source.x + b * cos_target.y * cos_target.x;
+  float y = a * cos_source.y * sin_source.x + b * cos_target.y * sin_target.x;
+  float z = a * sin_source.y + b * sin_target.y;
+  return vec2(atan(y, x), atan(z, sqrt(x * x + y * y)));
+
 }
 
 void main() {
@@ -133,54 +122,44 @@ void main() {
   float segmentRatio = getSegmentRatio(segmentIndex);
   float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
 
-  if(u_line_type == LineTypeDash) {
+  if (u_line_type == LineTypeDash) {
     v_distance_ratio = segmentIndex / segmentNumber;
-    vec2 s = source;
-    vec2 t = target;
-    
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-      s = unProjCustomCoord(source);
-      t = unProjCustomCoord(target);
-    }
-    float total_Distance = pixelDistance(s, t) / 2.0 * PI;
-    total_Distance = total_Distance*16.0; // total_Distance*16.0 调整默认的效果
+    float total_Distance = pixelDistance(source, target) / 2.0 * PI;
+    total_Distance = total_Distance * 16.0; // total_Distance*16.0 调整默认的效果
     v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / total_Distance;
   }
 
-  if(u_animate.x == Animate) {
-      v_distance_ratio = segmentIndex / segmentNumber;
+  if (u_animate.x == Animate) {
+    v_distance_ratio = segmentIndex / segmentNumber;
   }
 
   float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
   v_distance_ratio = segmentIndex / segmentNumber;
-  vec4 curr = project_position(vec4(degrees(interpolate(source, target, angularDist, segmentRatio)), 0.0, 1.0));
-  vec4 next = project_position(vec4(degrees(interpolate(source, target, angularDist, nextSegmentRatio)), 0.0, 1.0));
+
+  vec4 curr = project_position(vec4(degrees(interpolate(source, target, angularDist, segmentRatio)), 0.0, 1.0), a_Instance64Low.xy);
+  vec4 next = project_position(vec4(degrees(interpolate(source, target, angularDist, nextSegmentRatio)), 0.0, 1.0), a_Instance64Low.zw);
+
   // v_normal = getNormal((next.xy - curr.xy) * indexDir, a_Position.y);
   vec2 offset = project_pixel(getExtrusionOffset((next.xy - curr.xy) * indexDir, a_Position.y));
   //  vec4 project_pos = project_position(vec4(curr.xy, 0, 1.0));
   // gl_Position = project_common_position_to_clipspace(vec4(curr.xy + offset, curr.z, 1.0));
 
   v_line_data.g = a_Position.x; // 该顶点在弧线上的分段排序
-  if(LineTexture == u_line_texture) { // 开启贴图模式  
-    // float mapZoomScale = u_CoordinateSystem !== COORDINATE_SYSTEM_P20_2?10000000.0:1.0;
+  if (LineTexture == u_line_texture) {
     float d_arcDistrance = length(source - target);
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20) { // amap
-      d_arcDistrance = d_arcDistrance * 1000000.0;
-    }
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) { // mapbox
-      d_arcDistrance = project_pixel_allmap(d_arcDistrance);
-    }
-    float d_pixelLen = project_pixel(u_icon_step)/8.0;
-    v_line_data.b = floor(d_arcDistrance/d_pixelLen); // 贴图在弧线上重复的数量
+    d_arcDistrance = project_pixel(d_arcDistrance);
+
+    float d_pixelLen = project_pixel(u_icon_step) / 8.0;
+    v_line_data.b = floor(d_arcDistrance / d_pixelLen); // 贴图在弧线上重复的数量
 
     float lineOffsetWidth = length(offset + offset * sign(a_Position.y)); // 线横向偏移的距离
-    float linePixelSize = project_pixel(a_Size);  // 定点位置偏移，按地图等级缩放后的距离
-    v_line_data.a = lineOffsetWidth/linePixelSize;  // 线图层贴图部分的 v 坐标值
+    float linePixelSize = project_pixel(a_Size); // 定点位置偏移，按地图等级缩放后的距离
+    v_line_data.a = lineOffsetWidth / linePixelSize; // 线图层贴图部分的 v 坐标值
 
     v_iconMapUV = a_iconMapUV;
   }
 
-  gl_Position = project_common_position_to_clipspace_v2(vec4(curr.xy + offset, 0, 1.0));
+  gl_Position = project_common_position_to_clipspace(vec4(curr.xy + offset, 0, 1.0));
   setPickingColor(a_PickingColor);
 }
 

package/es/line/shaders/line/line_vert.glsl

@@ -1,12 +1,12 @@
+#define Animate (0.0)
 
-#define Animate 0.0
-
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in vec2 a_Size;
-layout(location = 10) in vec3 a_DistanceAndIndexAndMiter;
-layout(location = 13) in vec4 a_Normal_Total_Distance;
-layout(location = 14) in vec2 a_iconMapUV;
+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 vec2 a_Size;
+layout(location = ATTRIBUTE_LOCATION_DISTANCE_INDEX) in vec3 a_DistanceAndIndexAndMiter;
+layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec4 a_Normal_Total_Distance;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_iconMapUV;
 
 layout(std140) uniform commonUniorm {
   vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
@@ -27,7 +27,6 @@ layout(std140) uniform commonUniorm {
   float u_time;
 };
 
-
 out vec4 v_color;
 out vec4 v_stroke;
 //dash
@@ -50,69 +49,53 @@ void main() {
   v_d_distance_ratio = a_DistanceAndIndex.x / a_Total_Distance;
 
   // cal style mapping - 数据纹理映射部分的计算
-  float d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
+  float d_texPixelLen; // 贴图的像素长度，根据地图层级缩放
   v_iconMapUV = a_iconMapUV;
   d_texPixelLen = project_float_pixel(u_icon_step);
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    d_texPixelLen *= 10.0;
-  }
 
   v_color = a_Color;
   v_color.a *= opacity;
   v_stroke = stroke;
 
-  vec3 size = a_Miter * setPickingSize(a_Size.x) * reverse_offset_normal(a_Normal);
-  
+  vec3 size = a_Miter * setPickingSize(a_Size.x) * a_Normal;
+
   vec2 offset = project_pixel(size.xy);
 
   float lineDistance = a_DistanceAndIndex.x;
   float currentLinePointRatio = lineDistance / a_Total_Distance;
- 
 
   float lineOffsetWidth = length(offset + offset * sign(a_Miter)); // 线横向偏移的距离（向两侧偏移的和）
-  float linePixelSize = project_pixel(a_Size.x) * 2.0;  // 定点位置偏移，按地图等级缩放后的距离 单侧 * 2
-  float texV = lineOffsetWidth/linePixelSize; // 线图层贴图部分的 v 坐标值
-  
+  float linePixelSize = project_pixel(a_Size.x) * 2.0; // 定点位置偏移，按地图等级缩放后的距离 单侧 * 2
+  float texV = lineOffsetWidth / linePixelSize; // 线图层贴图部分的 v 坐标值
+
   v_texture_data = vec4(currentLinePointRatio, lineDistance, d_texPixelLen, texV);
   // 设置数据集的参数
 
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0), a_Position64Low);
 
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, a_Size.y, 1.0));
 
   float h = float(a_Position.z) * u_vertexScale; // 线顶点的高度 - 兼容不存在第三个数值的情况 vertex height
   float lineHeight = a_Size.y; // size 第二个参数代表的高度 [linewidth, lineheight]
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    lineHeight *= 0.2; // 保持和 amap/mapbox 一致的效果
-    h *= 0.2;
-    if(u_heightfixed < 1.0) {
-      lineHeight = project_pixel(a_Size.y);
-    }
-    gl_Position = u_Mvp * (vec4(project_pos.xy + offset, lineHeight + h + u_raisingHeight, 1.0));
-  } else {
-    // 兼容 mapbox 在线高度上的效果表现基本一致
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      // mapbox
-      // 保持高度相对不变
-      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
-      h *= mapboxZoomScale;
-      h += u_raisingHeight * mapboxZoomScale;
-      if(u_heightfixed > 0.0) {
-        lineHeight *= mapboxZoomScale;
-      }
-      
-    } else {
-      // amap
-      h += u_raisingHeight;
-      // lineHeight 顶点偏移高度
-      if(u_heightfixed < 1.0) {
-        lineHeight *= pow(2.0, 20.0 - u_Zoom);
-      }
+  // 兼容 mapbox 在线高度上的效果表现基本一致
+  if (
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
+  ) {
+    // mapbox
+    // 保持高度相对不变
+    float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);
+    h *= mapboxZoomScale;
+    h += u_raisingHeight * mapboxZoomScale;
+    if (u_heightfixed > 0.0) {
+      lineHeight *= mapboxZoomScale;
     }
-
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, lineHeight + h, 1.0));
   }
 
+  gl_Position = project_common_position_to_clipspace(
+    vec4(project_pos.xy + offset, lineHeight + h, 1.0)
+  );
+
   setPickingColor(a_PickingColor);
 }

package/es/line/shaders/simple/simpleline_vert.glsl

@@ -1,6 +1,7 @@
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in vec4 a_SizeDistanceAndTotalDistance;
+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 vec4 a_SizeDistanceAndTotalDistance;
 
 layout(std140) uniform commonUniorm {
   vec4 u_sourceColor;
@@ -21,30 +22,24 @@ void main() {
   //dash输出
   v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / a_SizeDistanceAndTotalDistance.a;
 
-  v_color = a_Color; 
+  v_color = a_Color;
   v_distanceScale = a_SizeDistanceAndTotalDistance.b / a_SizeDistanceAndTotalDistance.a;
   v_color.a = v_color.a * opacity;
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0), a_Position64Low);
 
   float h = float(a_Position.z) * u_vertexScale; // 线顶点的高度 - 兼容不存在第三个数值的情况
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xy, project_pixel(a_SizeDistanceAndTotalDistance.y) + h * 0.2, 1.0));
-  } else {
-    float lineHeight = a_SizeDistanceAndTotalDistance.y;
-    // 兼容 mapbox 在线高度上的效果表现基本一致
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      // 保持高度相对不变
-      h *= 2.0/pow(2.0, 20.0 - u_Zoom);
-    }
-
-    // amap1.x
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {
-      // 保持高度相对不变
-      lineHeight *= pow(2.0, 20.0 - u_Zoom);
-    }
-
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));
-    gl_PointSize = 10.0;
+  float lineHeight = a_SizeDistanceAndTotalDistance.y;
+  // 兼容 mapbox 在线高度上的效果表现基本一致
+  if (
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
+  ) {
+    // 保持高度相对不变
+    h *= 2.0 / pow(2.0, 20.0 - u_Zoom);
   }
+
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));
+  gl_PointSize = 10.0;
+
 }

package/es/line/shaders/wall/wall_vert.glsl

@@ -1,14 +1,11 @@
 #define Animate 0.0
-layout(location = 0) in vec3 a_Position;
-layout(location = 1) in vec4 a_Color;
-layout(location = 9) in vec2 a_Size;
-layout(location = 10) in float a_Miter;
-layout(location = 11) in float a_Total_Distance;
-layout(location = 12) in vec4 a_Instance;
-layout(location = 13) in vec3 a_Normal;
-layout(location = 14) in vec2 a_iconMapUV;
-layout(location = 15) in float a_Distance;
-
+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 vec2 a_Size;
+layout(location = ATTRIBUTE_LOCATION_NORMAL) in vec3 a_Normal;
+layout(location = ATTRIBUTE_LOCATION_UV) in vec2 a_iconMapUV;
+layout(location = ATTRIBUTE_LOCATION_DISTANCE_MITER_TOTAL) in vec3 a_Distance_Total_Miter;
 
 layout(std140) uniform commonUniorm {
   vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
@@ -23,6 +20,7 @@ layout(std140) uniform commonUniorm {
   float u_iconStepCount;
   float u_time;
 };
+
 #pragma include "projection"
 #pragma include "light"
 #pragma include "picking"
@@ -35,66 +33,59 @@ out float v_radio;
 out vec4 v_dataset;
 
 void main() {
-
+  float a_Distance = a_Distance_Total_Miter.x;
+  float a_Miter = a_Distance_Total_Miter.y;
+  float a_Total_Distance = a_Distance_Total_Miter.z;
 
   float d_distance_ratio; // 当前点位距离占线总长的比例
-  float d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
+  float d_texPixelLen; // 贴图的像素长度，根据地图层级缩放
 
   v_iconMapUV = a_iconMapUV;
-  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
+  if (u_heightfixed < 1.0) {
+    // 高度随 zoom 调整
     d_texPixelLen = project_pixel(u_icon_step);
   } else {
     d_texPixelLen = u_icon_step;
   }
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    d_texPixelLen *= 10.0;
-  }
 
-  if(u_animate.x == Animate || u_linearColor == 1.0) {
-      d_distance_ratio = a_Distance / a_Total_Distance;
+  if (u_animate.x == Animate || u_linearColor == 1.0) {
+    d_distance_ratio = a_Distance / a_Total_Distance;
   }
 
-  float miter = (a_Miter + 1.0)/2.0;
+  float miter = (a_Miter + 1.0) / 2.0;
   // 设置数据集的参数
   v_dataset[0] = d_distance_ratio; // 当前点位距离占线总长的比例
-  v_dataset[1] = a_Distance;       // 当前顶点的距离
-  v_dataset[2] = d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-  v_dataset[3] = miter;          // 线图层贴图部分的 v 坐标值 0 - 1
+  v_dataset[1] = a_Distance; // 当前顶点的距离
+  v_dataset[2] = d_texPixelLen; // 贴图的像素长度，根据地图层级缩放
+  v_dataset[3] = miter; // 线图层贴图部分的 v 坐标值 0 - 1
 
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0), a_Position64Low);
 
-  float originSize = a_Size.x;  // 固定高度
-  if(u_heightfixed < 1.0) {    
-     originSize = project_float_meter(a_Size.x); // 高度随 zoom 调整
+  float originSize = a_Size.x; // 固定高度
+  if (u_heightfixed < 1.0) {
+    originSize = project_float_meter(a_Size.x); // 高度随 zoom 调整
   }
 
-
   float wallHeight = originSize * miter;
   float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));
 
   v_blur = min(project_float_pixel(2.0) / originSize, 0.05);
   v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xy, wallHeight, 1.0));
-  } else {
-// 兼容 mapbox 在线高度上的效果表现基本一致
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      // mapbox
-      // 保持高度相对不变
-      float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);
-      if(u_heightfixed > 0.0) {
-        wallHeight *= mapboxZoomScale;
-      }
-      
-    } else {
-      // lineHeight 顶点偏移高度
-      if(u_heightfixed < 1.0) {
-        wallHeight *= pow(2.0, 20.0 - u_Zoom);
-      }
+  // 兼容 mapbox 在线高度上的效果表现基本一致
+  if (
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
+    u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
+  ) {
+    // mapbox
+    // 保持高度相对不变
+    float mapboxZoomScale = 4.0 / pow(2.0, 21.0 - u_Zoom);
+    if (u_heightfixed > 0.0) {
+      wallHeight *= mapboxZoomScale;
     }
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));
   }
 
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));
+
   setPickingColor(a_PickingColor);
 }

package/es/mask/models/fill.js

@@ -6,7 +6,7 @@ import { polygonTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../../shader/minify_frag.glsl' */
 const mask_frag = "layout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\nout vec4 outputColor;\n\nvoid main() {\n  outputColor = u_color;\n  outputColor.a *= u_opacity;\n}\n";
 /* babel-plugin-inline-import '../shaders/mask_vert.glsl' */
-const mask_vert = "layout(location = 0) in vec3 a_Position;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\n#pragma include \"projection\"\n\nvoid main() {\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
+const mask_vert = "layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\n#pragma include \"projection\"\n\nvoid main() {\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n}\n\n";
 export default class MaskModel extends BaseModel {
   getUninforms() {
     const commoninfo = this.getCommonUniformsInfo();
@@ -40,6 +40,7 @@ export default class MaskModel extends BaseModel {
         moduleName: 'mask',
         vertexShader: mask_vert,
         fragmentShader: mask_frag,
+        defines: _this2.getDefines(),
         triangulation: polygonTriangulation,
         depth: {
           enable: false

package/es/mask/shaders/mask_vert.glsl

@@ -1,4 +1,4 @@
-layout(location = 0) in vec3 a_Position;
+layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
 
 layout(std140) uniform commonUniorm {
   vec4 u_color;
@@ -9,11 +9,6 @@ layout(std140) uniform commonUniorm {
 
 void main() {
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
-  }
+  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 }
 

package/es/plugins/DataMappingPlugin.d.ts

@@ -5,7 +5,6 @@ export default class DataMappingPlugin implements ILayerPlugin {
     apply(layer: ILayer, { styleAttributeService, mapService, fontService }: L7Container): void;
     private generateMaping;
     private mapping;
-    private adjustData2Amap2Coordinates;
     private adjustData2SimpleCoordinates;
     private unProjectCoordinates;
     private applyAttributeMapping;

package/es/plugins/DataMappingPlugin.js

@@ -2,10 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { IDebugLog, ILayerStage } from '@antv/l7-core';
-import { lodashUtil, normalize, rgb2arr } from '@antv/l7-utils';
-const {
-  cloneDeep
-} = lodashUtil;
+import { normalize, rgb2arr } from '@antv/l7-utils';
 export default class DataMappingPlugin {
   constructor() {
     _defineProperty(this, "mapService", void 0);
@@ -136,31 +133,11 @@ export default class DataMappingPlugin {
     attributes.forEach(attribute => {
       attribute.needRemapping = false;
     });
-    // 调整数据兼容 Amap2.0
-    this.adjustData2Amap2Coordinates(mappedData, layer);
 
     // 调整数据兼容 SimpleCoordinates
     this.adjustData2SimpleCoordinates(mappedData);
     return mappedData;
   }
-  adjustData2Amap2Coordinates(mappedData, layer) {
-    // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移
-    if (mappedData.length > 0 && this.mapService.version === 'GAODE2.x') {
-      const layerCenter = layer.coordCenter || layer.getSource().center;
-      // 单个的点数据
-      // @ts-ignore
-      mappedData
-      // TODO: 避免经纬度被重复计算导致坐标位置偏移
-      .filter(d => !d.originCoordinates).map(d => {
-        d.version = 'GAODE2.x';
-        // @ts-ignore
-        d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
-        // @ts-ignore
-        // d.coordinates = this.mapService.lngLatToCoord(d.coordinates);
-        d.coordinates = this.mapService.coordToAMap2RelativeCoordinates(d.coordinates, layerCenter);
-      });
-    }
-  }
   adjustData2SimpleCoordinates(mappedData) {
     if (mappedData.length > 0 && this.mapService.version === 'SIMPLE') {
       mappedData.map(d => {

package/es/plugins/PixelPickingPlugin.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { AttributeType, gl } from '@antv/l7-core';
 import { decodePickingColor, encodePickingColor, lodashUtil, rgb2arr } from '@antv/l7-utils';
-import { ShaderLocation } from "../core/CommonStyleAttribute";
+import { COMMON_ATTRIBUTE_LOCATION } from "../core/CommonStyleAttribute";
 const {
   isNumber
 } = lodashUtil;
@@ -59,7 +59,7 @@ export default class PixelPickingPlugin {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_PickingColor',
-          shaderLocation: ShaderLocation.PICKING_COLOR,
+          shaderLocation: COMMON_ATTRIBUTE_LOCATION.PICKING_COLOR,
           buffer: {
             data: [],
             type: gl.FLOAT

package/es/plugins/RegisterStyleAttributePlugin.d.ts

@@ -7,5 +7,4 @@ export default class RegisterStyleAttributePlugin implements ILayerPlugin {
     private registerBuiltinAttributes;
     private registerPositionAttribute;
     private registerColorAttribute;
-    private registerVertexIdAttribute;
 }