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

package/es/line/shaders/arc/line_arc_vert.glsl

@@ -1,12 +1,10 @@
-#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;
+#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;
 
 layout(std140) uniform commonUniorm {
   vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
@@ -24,7 +22,6 @@ layout(std140) uniform commonUniorm {
   float u_time;
   float u_linearColor: 0.0;
 };
-
 out vec4 v_color;
 out vec2 v_iconMapUV;
 out vec4 v_lineData;
@@ -32,12 +29,13 @@ out vec4 v_lineData;
 out vec4 v_dash_array;
 out float v_distance_ratio;
 
+
 #pragma include "projection"
 #pragma include "project"
 #pragma include "picking"
 
 float bezier3(vec3 arr, float t) {
-  float ut = 1.0 - t;
+  float ut = 1. - t;
   return (arr.x * ut + arr.y * t) * ut + (arr.y * ut + arr.z * t) * t;
 }
 vec2 midPoint(vec2 source, vec2 target, float arcThetaOffset) {
@@ -47,12 +45,10 @@ vec2 midPoint(vec2 source, vec2 target, float arcThetaOffset) {
   float thetaOffset = arcThetaOffset;
   float r2 = r / 2.0 / cos(thetaOffset);
   float theta2 = theta + thetaOffset;
-  vec2 mid = vec2(r2 * cos(theta2) + source.x, r2 * sin(theta2) + source.y);
-  if (u_lineDir == 1.0) {
-    // 正向
+  vec2 mid = vec2(r2*cos(theta2) + source.x, r2*sin(theta2) + source.y);
+  if(u_lineDir == 1.0) { // 正向
     return mid;
-  } else {
-    // 逆向
+  } else { // 逆向
     // (mid + vmin)/2 = (s + t)/2
     vec2 vmid = source + target - mid;
     return vmid;
@@ -60,23 +56,23 @@ vec2 midPoint(vec2 source, vec2 target, float arcThetaOffset) {
   // return mid;
 }
 float getSegmentRatio(float index) {
-  // dash: index / (segmentNumber - 1.);
-  // normal: smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
-  return smoothstep(0.0, 1.0, index / (segmentNumber - 1.0));
-  //  return index / (segmentNumber - 1.);
+    // dash: index / (segmentNumber - 1.);
+    // normal: smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
+    return smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
+    //  return index / (segmentNumber - 1.);
 }
-vec2 interpolate(vec2 source, vec2 target, float t, float arcThetaOffset) {
+vec2 interpolate (vec2 source, vec2 target, float t, float arcThetaOffset) {
   // if the angularDist is PI, linear interpolation is applied. otherwise, use spherical interpolation
   vec2 mid = midPoint(source, target, arcThetaOffset);
   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));
+  return vec2(bezier3(x ,t), bezier3(y,t));
 }
 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);
+   dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
   vec2 offset = dir_screenspace * offset_direction * setPickingSize(a_Size) / 2.0;
   return offset;
 }
@@ -85,34 +81,43 @@ vec2 getNormal(vec2 line_clipspace, float offset_direction) {
   vec2 dir_screenspace = normalize(line_clipspace);
   // rotate by 90 degrees
    dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
-   return dir_screenspace.xy * sign(offset_direction);
+   return reverse_offset_normal(vec3(dir_screenspace,1.0)).xy * sign(offset_direction);
 }
 
 void main() {
   //vs中计算渐变色
-  if (u_linearColor == 1.0) {
+  if(u_linearColor==1.0){
     float d_segmentIndex = a_Position.x + 1.0; // 当前顶点在弧线中所处的分段位置
-    v_color = mix(u_sourceColor, u_targetColor, d_segmentIndex / segmentNumber);
-  } else {
+    v_color = mix(u_sourceColor, u_targetColor, d_segmentIndex/segmentNumber);
+  }
+  else{
     v_color = a_Color;
   }
   v_color.a = v_color.a * opacity;
 
-  vec2 source_world = a_Instance.rg; // 起始点
-  vec2 target_world = a_Instance.ba; // 终点
+  vec2 source = a_Instance.rg;  // 起始点
+  vec2 target =  a_Instance.ba; // 终点
+
+
 
   float segmentIndex = a_Position.x;
   float segmentRatio = getSegmentRatio(segmentIndex);
 
-  // 计算 dashArray 和 distanceRatio 输出到片元
-  float total_Distance = pixelDistance(source_world, target_world) / 2.0 * PI;
+  //计算dashArray和distanceRatio 输出到片元
+  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;
   v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / total_Distance;
   v_distance_ratio = segmentIndex / segmentNumber;
 
   float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
   float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
   float d_distance_ratio;
-
+  
   if(u_animate.x == Animate) {
       d_distance_ratio = segmentIndex / segmentNumber;
       if(u_lineDir != 1.0) {
@@ -122,21 +127,22 @@ void main() {
 
   v_lineData.b = d_distance_ratio;
 
-  vec4 source = project_position(vec4(source_world, 0, 1.), a_Instance64Low.xy);
-  vec4 target = project_position(vec4(target_world, 0, 1.), a_Instance64Low.zw);
+  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, thetaOffset), 0.0, 1.0));
+  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, thetaOffset), 0.0, 1.0));
 
-  vec2 currPos = interpolate(source.xy, target.xy, segmentRatio, thetaOffset);
-  vec2 nextPos = interpolate(source.xy, target.xy, nextSegmentRatio, thetaOffset);
+  
+  vec2 offset = project_pixel(getExtrusionOffset((next.xy - curr.xy) * indexDir, a_Position.y));
 
-  vec2 offset = project_pixel(
-    getExtrusionOffset((nextPos.xy - currPos.xy) * indexDir, a_Position.y)
-  );
 
   float d_segmentIndex = a_Position.x + 1.0; // 当前顶点在弧线中所处的分段位置
   v_lineData.r = d_segmentIndex;
 
   if(LineTexture == u_line_texture) { // 开启贴图模式
+
     float arcDistrance = length(source - target); // 起始点和终点的距离
+    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20) { // amap
+      arcDistrance *= 1000000.0;
+    }
     if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) { // mapbox
       // arcDistrance *= 8.0;
       arcDistrance = project_pixel_allmap(arcDistrance);
@@ -144,15 +150,15 @@ void main() {
     v_iconMapUV = a_iconMapUV;
 
     float pixelLen = project_pixel_texture(u_icon_step); // 贴图沿弧线方向的长度 - 随地图缩放改变
-    float texCount = floor(arcDistrance / pixelLen); // 贴图在弧线上重复的数量
+    float texCount = floor(arcDistrance/pixelLen); // 贴图在弧线上重复的数量
     v_lineData.g = texCount;
 
     float lineOffsetWidth = length(offset + offset * sign(a_Position.y)); // 线横向偏移的距离
     float linePixelSize = project_pixel(a_Size); // 定点位置偏移
-    v_lineData.a = lineOffsetWidth / linePixelSize; // 线图层贴图部分的 v 坐标值
+    v_lineData.a = lineOffsetWidth/linePixelSize; // 线图层贴图部分的 v 坐标值
   }
 
-  gl_Position = project_common_position_to_clipspace(vec4(currPos.xy + offset, 0, 1.0));
+  gl_Position = project_common_position_to_clipspace_v2(vec4(curr.xy + offset, 0, 1.0));
 
   setPickingColor(a_PickingColor);
 }

package/es/line/shaders/arc3d/line_arc_3d_vert.glsl

@@ -2,13 +2,11 @@
 #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(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;
 
 
 layout(std140) uniform commonUniorm {
@@ -77,7 +75,7 @@ vec2 getNormal(vec2 line_clipspace, float offset_direction) {
   vec2 dir_screenspace = normalize(line_clipspace);
   // rotate by 90 degrees
   dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
-  return dir_screenspace.xy * sign(offset_direction);
+  return reverse_offset_normal(vec3(dir_screenspace,1.0)).xy * sign(offset_direction);
 }
 
 float torad(float deg) {
@@ -109,8 +107,8 @@ void main() {
     v_color = a_Color;
   }
   v_color.a = v_color.a * opacity;
-  vec2 source = project_position(vec4(a_Instance.rg, 0, 0), a_Instance64Low.xy).xy;
-  vec2 target = project_position(vec4(a_Instance.ba, 0, 0), a_Instance64Low.zw).xy;
+  vec2 source = project_position(vec4(a_Instance.rg, 0, 0)).xy;
+  vec2 target = project_position(vec4(a_Instance.ba, 0, 0)).xy;
   float segmentIndex = a_Position.x;
   float segmentRatio = getSegmentRatio(segmentIndex);
   float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
@@ -118,7 +116,14 @@ void main() {
   float d_distance_ratio;
    if(u_line_type == LineTypeDash) {
     d_distance_ratio = segmentIndex / segmentNumber;
-    float total_Distance = pixelDistance(source, target) / 2.0 * PI;
+    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;
     v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / (total_Distance / segmentNumber * segmentIndex);
   }
     if(u_animate.x == Animate) {
@@ -134,7 +139,7 @@ void main() {
 
 
   v_segmentIndex = a_Position.x;
-  if(LineTexture == u_line_texture && u_line_type != LineTypeDash) { // 开启贴图模式
+  if(LineTexture == u_line_texture && u_line_type != LineTypeDash) { // 开启贴图模式  
 
     float arcDistrance = length(source - target);
     float pixelLen =  project_pixel_texture(u_icon_step);
@@ -149,7 +154,7 @@ void main() {
   }
 
 
-  gl_Position = project_common_position_to_clipspace(vec4(curr.xy + project_pixel(offset), curr.z * thetaOffset, 1.0));
+  gl_Position = project_common_position_to_clipspace_v2(vec4(curr.xy + project_pixel(offset), curr.z * thetaOffset, 1.0));
 
   // 地球模式
   if(u_globel > 0.0) {
@@ -168,10 +173,10 @@ void main() {
     float lineHeight = u_global_height * (-4.0*segmentRatio*segmentRatio + 4.0 * segmentRatio) * lnglatLength;
     // 地球点位
     vec3 globalPoint = normalize(mix(startLngLat, endLngLat, segmentRatio)) * (globalRadius + lineHeight) + lnglatOffset * a_Size;
-
+    
     gl_Position = u_ViewProjectionMatrix * vec4(globalPoint, 1.0);
   }
-
+ 
 
   setPickingColor(a_PickingColor);
 }

package/es/line/shaders/flow/flow_line_vert.glsl

@@ -1,9 +1,8 @@
-layout(location = ATTRIBUTE_LOCATION_POSITION) in vec3 a_Position;
-layout(location = ATTRIBUTE_LOCATION_COLOR) in vec4 a_Color;
-layout(location = ATTRIBUTE_LOCATION_SIZE) in vec2 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_NORMAL) in vec3 a_Normal;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in vec2 a_Size;
+layout(location = 12) in vec4 a_Instance;
+layout(location = 13) in vec3 a_Normal;
 
 layout(std140) uniform commonUniorm {
   float u_gap_width: 1.0;
@@ -18,59 +17,78 @@ layout(std140) uniform commonUniorm {
 out vec4 v_color;
 
 vec2 project_pixel_offset(vec2 offsets) {
-  vec2 data = project_pixel(offsets);
 
-  return vec2(data.x, -data.y);
+   vec2 data = project_pixel(offsets);
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+    return data;
+  }
+
+  return vec2(data.x, -data.y);;
 }
 
 vec2 line_dir(vec2 target, vec2 source) {
+
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+     return normalize(target - source);
+  }
   return normalize(ProjectFlat(target) - ProjectFlat(source));
 }
 
+float flag_gap() {
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+     return 1.;
+  }
+  return -1.;
 
-void main() {
-  // 透明度计算
-  vec2 source_world = a_Instance.rg; // 起点
-  vec2 target_world = a_Instance.ba; // 终点
-  vec2 flowlineDir = line_dir(target_world, source_world);
-  vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x); // mapbox || 高德
+}
 
-  vec2 position = mix(source_world, target_world, a_Position.x);
-  vec2 position64Low = mix(a_Instance64Low.rg, a_Instance64Low.ba, a_Position.x);
 
-  float lengthCommon = length(
-    project_position(vec4(target_world, 0, 1)) - project_position(vec4(source_world, 0, 1))
-  );
+void main() {
+
+// 透明度计算
+  vec2 source = a_Instance.rg;  // 起始点
+  vec2 target =  a_Instance.ba; // 终点
+  vec2 flowlineDir = line_dir(target,source);
+  vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x); // mapbox || 高德
+   
+  vec2 position = mix(source, target, a_Position.x);
+  
+  float lengthCommon = length(project_position(vec4(target,0,1)) - project_position(vec4(source,0,1)));  //    
   vec2 offsetDistances = a_Size.x * project_pixel_offset(vec2(a_Position.y, a_Position.z)); // Mapbox || 高德
-  vec2 limitedOffsetDistances = clamp(
-    offsetDistances,
-    project_pixel(-lengthCommon * 0.2),
-    project_pixel(lengthCommon * 0.2)
+  vec2 limitedOffsetDistances = clamp(   
+   offsetDistances,
+   project_pixel(-lengthCommon*.2), project_pixel(lengthCommon*.2)
   );
 
+
   float startOffsetCommon = project_pixel(offsets[0]);
   float endOffsetCommon = project_pixel(offsets[1]);
   float endpointOffset = mix(
-    clamp(startOffsetCommon, 0.0, lengthCommon * 0.2),
-    -clamp(endOffsetCommon, 0.0, lengthCommon * 0.2),
+    clamp(startOffsetCommon, 0.0, lengthCommon*.2),
+    -clamp(endOffsetCommon, 0.0, lengthCommon*.2),
     a_Position.x
   );
 
-  vec2 normalsCommon = u_stroke_width * project_pixel_offset(vec2(a_Normal.x, a_Normal.y)); // mapbox || 高德
+  vec2 normalsCommon =  u_stroke_width * project_pixel_offset(vec2(a_Normal.x, a_Normal.y)); // mapbox || 高德
 
-  float gapCommon = -1. * project_pixel(u_gap_width);
+  float gapCommon = flag_gap() * project_pixel(u_gap_width);
   vec3 offsetCommon = vec3(
     flowlineDir * (limitedOffsetDistances[1] + normalsCommon.y + endpointOffset * 1.05) -
-      perpendicularDir * (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),
+    perpendicularDir *  (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),
     0.0
   );
 
-  vec4 project_pos = project_position(vec4(position.xy, 0, 1.0), position64Low);
+  vec4 project_pos = project_position(vec4(position.xy, 0, 1.0));
 
   vec4 fillColor = vec4(a_Color.rgb, a_Color.a * opacity);
   v_color = mix(fillColor, vec4(u_stroke.xyz, u_stroke.w * fillColor.w * u_stroke_opacity), a_Normal.z);
 
-  gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy +  offsetCommon.xy, 0., 1.0));
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy +  offsetCommon.xy, 0., 1.0));
+
+
 
   setPickingColor(a_PickingColor);
 }

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

@@ -1,14 +1,13 @@
-#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;
+#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;
 
 layout(std140) uniform commonUniorm {
   vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
@@ -35,12 +34,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.0);
+  return index / (segmentNumber - 1.);
 }
 
 float paraboloid(vec2 source, vec2 target, float ratio) {
@@ -54,29 +53,33 @@ 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 dir_screenspace.xy * sign(offset_direction);
+   dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
+   return reverse_offset_normal(vec3(dir_screenspace,1.0)).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));
 }
 
@@ -87,29 +90,37 @@ 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.0 - t;
+  float ut = 1. - 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 (abs(angularDist - PI) < 0.001) {
-    return (1.0 - t) * source + t * target;
+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)));
   }
-  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() {
@@ -122,49 +133,54 @@ 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;
-    float total_Distance = pixelDistance(source, target) / 2.0 * PI;
-    total_Distance = total_Distance * 16.0; // total_Distance*16.0 调整默认的效果
+    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 调整默认的效果
     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), a_Instance64Low.xy);
-  vec4 next = project_position(vec4(degrees(interpolate(source, target, angularDist, nextSegmentRatio)), 0.0, 1.0), a_Instance64Low.zw);
-
+  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));
   // 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) {
+  if(LineTexture == u_line_texture) { // 开启贴图模式  
+    // float mapZoomScale = u_CoordinateSystem !== COORDINATE_SYSTEM_P20_2?10000000.0:1.0;
     float d_arcDistrance = length(source - target);
-    if (
-      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT ||
-      u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET
-    ) {
-      // mapbox
+    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); // 贴图在弧线上重复的数量
+    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(vec4(curr.xy + offset, 0, 1.0));
+  gl_Position = project_common_position_to_clipspace_v2(vec4(curr.xy + offset, 0, 1.0));
   setPickingColor(a_PickingColor);
 }