@antv/l7-layers 2.12.2 → 2.13.1

package/lib/point/models/text.js

@@ -54,7 +54,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var textFrag = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 48.0\nuniform sampler2D u_sdf_map;\nuniform float u_gamma_scale : 0.5;\n// uniform float u_font_size : 24.0;\nuniform float u_opacity : 1.0;\nuniform vec4 u_stroke_color : [0, 0, 0, 1];\nuniform float u_stroke_width : 2.0;\nuniform float u_halo_blur : 0.5;\nuniform float u_DevicePixelRatio;\n\nvarying vec4 v_color;\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying float v_fontScale;\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\n#pragma include \"picking\"\nvoid main() {\n  // get style data mapping\n  float opacity = styleMappingMat[0][0];\n  float strokeWidth = styleMappingMat[0][2];\n  vec4 textrueStroke = vec4(\n    styleMappingMat[1][0],\n    styleMappingMat[1][1],\n    styleMappingMat[1][2],\n    styleMappingMat[1][3]\n  );\n\n  // get sdf from atlas\n  float dist = texture2D(u_sdf_map, v_uv).a;\n\n  // float fontScale = u_font_size / FONT_SIZE;\n\n  // lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;\n  lowp float buff = (6.0 - strokeWidth / v_fontScale) / SDF_PX;\n  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;\n\n  highp float gamma_scaled = gamma * v_gamma_scale;\n\n  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);\n  // gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), vec4(u_stroke_color.rgb, u_stroke_color.a * u_opacity), smoothstep(0., 0.5, 1. - dist));\n  gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), vec4(textrueStroke.rgb, textrueStroke.a * opacity), smoothstep(0., 0.5, 1. - dist));\n  gl_FragColor.a= gl_FragColor.a * alpha;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 
 /* babel-plugin-inline-import '../shaders/text_vert.glsl' */
-var textVert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\nattribute vec3 a_Position;\nattribute vec2 a_tex;\nattribute vec2 a_textOffsets;\nattribute vec4 a_Color;\nattribute float a_Size;\nattribute float a_Rotate;\n\nuniform vec2 u_sdf_map_size;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying vec4 v_color;\nvarying float v_fontScale;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\nuniform float u_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n   styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n\n   vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][2] = strokeWidthAndOffset.r;\n  textureOffset = strokeWidthAndOffset.g;\n\n  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);\n  if(hasStroke()) {\n    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R\n    textureOffset += 1.0;\n\n    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G\n    textureOffset += 1.0;\n\n    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B\n    textureOffset += 1.0;\n\n    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A\n    textureOffset += 1.0;\n  } else {\n    if(u_stroke_color == vec4(0.0)) {\n      styleMappingMat[1][0] = v_color.r;\n      styleMappingMat[1][1] = v_color.g;\n      styleMappingMat[1][2] = v_color.b;\n      styleMappingMat[1][3] = v_color.a;\n    } else {\n      styleMappingMat[1][0] = u_stroke_color.r;\n      styleMappingMat[1][1] = u_stroke_color.g;\n      styleMappingMat[1][2] = u_stroke_color.b;\n      styleMappingMat[1][3] = u_stroke_color.a;\n    }\n  }\n  \n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_color = a_Color;\n  v_uv = a_tex / u_sdf_map_size;\n\n  // \u6587\u672C\u7F29\u653E\u6BD4\u4F8B\n  float fontScale = a_Size / FONT_SIZE;\n  v_fontScale = fontScale;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // vec4 projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  highp float angle_sin = sin(a_Rotate);\n  highp float angle_cos = cos(a_Rotate);\n  mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);\n  \n  // gl_Position = vec4(projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n\n  float raiseHeight = u_raisingHeight;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    raiseHeight = u_raisingHeight * mapboxZoomScale;\n  }\n\n  vec4 projected_position;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n   projected_position  = u_Mvp * (vec4(a_Position.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n  } else { // else\n   projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n  }\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n  v_gamma_scale = gl_Position.w;\n  setPickingColor(a_PickingColor);\n\n}\n";
+var textVert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\nattribute vec3 a_Position;\nattribute vec2 a_tex;\nattribute vec2 a_textOffsets;\nattribute vec4 a_Color;\nattribute float a_Size;\nattribute float a_Rotate;\n\nuniform vec2 u_sdf_map_size;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying vec4 v_color;\nvarying float v_fontScale;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\nuniform float u_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n   styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n\n   vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][2] = strokeWidthAndOffset.r;\n  textureOffset = strokeWidthAndOffset.g;\n\n  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);\n  if(hasStroke()) {\n    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R\n    textureOffset += 1.0;\n\n    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G\n    textureOffset += 1.0;\n\n    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B\n    textureOffset += 1.0;\n\n    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A\n    textureOffset += 1.0;\n  } else {\n    if(u_stroke_color == vec4(0.0)) {\n      styleMappingMat[1][0] = v_color.r;\n      styleMappingMat[1][1] = v_color.g;\n      styleMappingMat[1][2] = v_color.b;\n      styleMappingMat[1][3] = v_color.a;\n    } else {\n      styleMappingMat[1][0] = u_stroke_color.r;\n      styleMappingMat[1][1] = u_stroke_color.g;\n      styleMappingMat[1][2] = u_stroke_color.b;\n      styleMappingMat[1][3] = u_stroke_color.a;\n    }\n  }\n  \n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_color = a_Color;\n  v_uv = a_tex / u_sdf_map_size;\n\n  // \u6587\u672C\u7F29\u653E\u6BD4\u4F8B\n  float fontScale = a_Size / FONT_SIZE;\n  v_fontScale = fontScale;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // vec4 projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  highp float angle_sin = sin(a_Rotate);\n  highp float angle_cos = cos(a_Rotate);\n  mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);\n  \n  // gl_Position = vec4(projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n\n  float raiseHeight = u_raisingHeight;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    raiseHeight = u_raisingHeight * mapboxZoomScale;\n  }\n\n  vec4 projected_position;\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n   projected_position  = u_Mvp *(vec4(a_Position.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n  } else { // else\n   projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n  }\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n  v_gamma_scale = gl_Position.w;\n  setPickingColor(a_PickingColor);\n\n}\n";
 
 function TextTriangulation(feature) {
   // @ts-ignore

package/lib/point/shaders/fill_vert.glsl

@@ -8,9 +8,7 @@ varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样
 
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
-uniform float u_meter2coord;
-uniform float u_meteryScale;
-uniform float u_isMeter;
+uniform int u_Size_Unit;
 
 varying vec4 v_data;
 varying vec4 v_color;
@@ -42,7 +40,7 @@ void main() {
   *  setPickingSize 设置拾取大小
   *  u_meter2coord 在等面积大小的时候设置单位
   */
-  float newSize = setPickingSize(a_Size) * u_meter2coord;
+  float newSize = setPickingSize(a_Size);
   // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;
 
   // cal style mapping - 数据纹理映射部分的计算
@@ -126,9 +124,11 @@ void main() {
 
   // unpack color(vec2)
   v_color = a_Color;
+if(u_Size_Unit == 1) {
+    newSize = newSize  * u_PixelsPerMeter.z;
+  }
 
-  // radius(16-bit)
-  v_radius = newSize;
+   v_radius = newSize;
 
   // anti-alias
   //  float antialiased_blur = -max(u_blur, antialiasblur);
@@ -136,26 +136,9 @@ void main() {
 
   vec2 offset = (extrude.xy * (newSize + u_stroke_width) + textrueOffsets);
   vec3 aPosition = a_Position;
-  if(u_isMeter < 1.0) {
-    // 不以米为实际单位
-    offset = project_pixel(offset);
-  } else {
-    // 以米为实际单位
-    if(newSize * pow(2.0, u_Zoom) < 48.0) {
-      antialiasblur = max(antialiasblur, -0.05);
-    } else if(newSize * pow(2.0, u_Zoom) < 128.0) {
-      antialiasblur = max(antialiasblur, -0.6/pow(u_Zoom, 2.0));
-    } else {
-      antialiasblur = max(antialiasblur, -0.8/pow(u_Zoom, 2.0));
-    }
-    
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      aPosition.x += offset.x / u_meteryScale;
-      aPosition.y += offset.y;
-      offset = vec2(0.0);
-    }
-  }
 
+  offset = project_pixel(offset);
+  
   // TODP: /abs(extrude.x) 是为了兼容地球模式
   v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);
 
@@ -177,7 +160,7 @@ void main() {
  
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);
+    gl_Position =  u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);
   } else {
     gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
   }

package/lib/point/shaders/image/fillImage_vert.glsl

@@ -10,7 +10,7 @@ varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform mat2 u_RotateMatrix;
-uniform float u_isMeter;
+uniform int u_Size_Unit;
 
 varying vec2 v_uv; // 本身的 uv 坐标
 varying vec2 v_Iconuv; // icon 贴图的 uv 坐标
@@ -76,22 +76,16 @@ void main() {
   highp float angle_sin = sin(a_Rotate);
   highp float angle_cos = cos(a_Rotate);
   mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);
+  float newSize = a_Size;
+  if(u_Size_Unit == 1) {
+    newSize = newSize  * u_PixelsPerMeter.z;
+  }
 
   // vec2 offset = (u_RotateMatrix * extrude.xy * (a_Size) + textrueOffsets);
-  vec2 offset = (rotation_matrix * u_RotateMatrix * extrude.xy * (a_Size) + textrueOffsets);
+  vec2 offset = (rotation_matrix * u_RotateMatrix * extrude.xy * (newSize) + textrueOffsets);
   vec3 aPosition = a_Position;
-  if(u_isMeter < 1.0) {
-    // 不以米为实际单位
-    offset = project_pixel(offset);
-  } else {
-    // 以米为实际单位
 
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      aPosition.xy += offset;
-      offset.x = 0.0;
-      offset.y = 0.0;
-    }
-  }
+  offset = project_pixel(offset);
 
   vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));
   float raisingHeight = u_raisingHeight;
@@ -105,7 +99,7 @@ void main() {
   }
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);
+    gl_Position = u_Mvp *vec4(project_pos.xy + offset, raisingHeight, 1.0);
   } else {
     gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));
   }

package/lib/point/shaders/radar/radar_vert.glsl

@@ -7,7 +7,7 @@ uniform float u_time;
 
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
-uniform float u_isMeter;
+uniform int u_Size_Unit;
 
 varying vec4 v_data;
 varying vec4 v_color;
@@ -31,37 +31,30 @@ void main() {
   // unpack color(vec2)
   v_color = a_Color;
 
-  // radius(16-bit)
-  v_radius = newSize;
+
 
   // anti-alias
   float blur = 0.0;
   float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);
 
+  if(u_Size_Unit == 1) {
+    newSize = newSize  * u_PixelsPerMeter.z;
+  }
+  // radius(16-bit)
+  v_radius = newSize;
+
   vec2 offset = (extrude.xy * (newSize));
   vec3 aPosition = a_Position;
-  if(u_isMeter < 1.0) {
+  
     // 不以米为实际单位
-    offset = project_pixel(offset);
-  } else {
-    // 以米为实际单位
-    antialiasblur *= pow(19.0 - u_Zoom, 2.0);
-    antialiasblur = max(antialiasblur, -0.01);
-    // offset *= 0.5;
-
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      aPosition.xy += offset;
-      offset.x = 0.0;
-      offset.y = 0.0;
-    }
-  }
-
+  offset = project_pixel(offset);
+  
   v_data = vec4(extrude.x, extrude.y, antialiasblur, -1.0);
 
   vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * vec4(project_pos.xy + offset, 0.0, 1.0);
+    gl_Position = u_Mvp *vec4(project_pos.xy + offset, 0.0, 1.0);
   } else {
     gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));
   }

package/lib/point/shaders/text_vert.glsl

@@ -118,7 +118,7 @@ void main() {
 
   vec4 projected_position;
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-   projected_position  = u_Mvp * (vec4(a_Position.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));
+   projected_position  = u_Mvp *(vec4(a_Position.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));
   } else { // else
    projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));
   }

package/lib/polygon/index.js

@@ -98,8 +98,6 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
         return 'ocean';
       } else if (shape === 'line') {
         return 'line';
-      } else if (shape === 'tile') {
-        return 'tile';
       } else {
         return this.getPointModelType();
       }

package/lib/polygon/models/index.js

@@ -25,8 +25,6 @@ var _fill2 = _interopRequireDefault(require("./fill"));
 
 var _ocean = _interopRequireDefault(require("./ocean"));
 
-var _tile = _interopRequireDefault(require("./tile"));
-
 var _water = _interopRequireDefault(require("./water"));
 
 var PolygonModels = {
@@ -39,9 +37,8 @@ var PolygonModels = {
   point_normal: _normal.default,
   point_extrude: _extrude.default,
   water: _water.default,
-  ocean: _ocean.default,
-  // point_fill: PointModels.fill,
-  tile: _tile.default
+  ocean: _ocean.default // point_fill: PointModels.fill,
+
 };
 var _default = PolygonModels;
 exports.default = _default;

package/lib/raster/models/raster.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_2d_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\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);\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  }\n}\n";
+var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\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);\n  else {\n   \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  }\n}\n";
 
 /* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
 var rasterVert = "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\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";
@@ -61,15 +61,15 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
           clampHigh = _ref$clampHigh === void 0 ? true : _ref$clampHigh,
           _ref$noDataValue = _ref.noDataValue,
           noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
-          _ref$domain = _ref.domain,
-          domain = _ref$domain === void 0 ? [0, 1] : _ref$domain,
+          domain = _ref.domain,
           rampColors = _ref.rampColors;
 
-      this.colorTexture = this.layer.textureService.getColorTexture(rampColors);
+      var newdomain = domain || (0, _l7Utils.getDefaultDomain)(rampColors);
+      this.colorTexture = this.layer.textureService.getColorTexture(rampColors, newdomain);
       return {
         u_opacity: opacity || 1,
         u_texture: this.texture,
-        u_domain: domain,
+        u_domain: newdomain,
         u_clampLow: clampLow,
         u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
         u_noDataValue: noDataValue,
@@ -245,22 +245,6 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         }
       });
     }
-  }, {
-    key: "updateColorTexture",
-    value: function updateColorTexture() {
-      var createTexture2D = this.rendererService.createTexture2D;
-
-      var _ref3 = this.layer.getLayerConfig(),
-          rampColors = _ref3.rampColors;
-
-      var imageData = (0, _l7Utils.generateColorRamp)(rampColors);
-      this.colorTexture = createTexture2D({
-        data: imageData.data,
-        width: imageData.width,
-        height: imageData.height,
-        flipY: false
-      });
-    }
   }]);
   return RasterModel;
 }(_BaseModel2.default);

package/lib/raster/models/rasterTerrainRgb.js

@@ -60,23 +60,23 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
           clampHigh = _ref$clampHigh === void 0 ? true : _ref$clampHigh,
           _ref$noDataValue = _ref.noDataValue,
           noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
-          _ref$domain = _ref.domain,
-          domain = _ref$domain === void 0 ? [0, 1] : _ref$domain,
+          domain = _ref.domain,
           rampColors = _ref.rampColors,
           colorTexture = _ref.colorTexture;
 
+      var newdomain = domain || (0, _l7Utils.getDefaultDomain)(rampColors);
       var texture = colorTexture;
 
       if (!colorTexture) {
-        texture = this.layer.textureService.getColorTexture(rampColors);
+        texture = this.layer.textureService.getColorTexture(rampColors, newdomain);
       } else {
-        this.layer.textureService.setColorTexture(colorTexture, rampColors);
+        this.layer.textureService.setColorTexture(colorTexture, rampColors, newdomain);
       }
 
       return {
         u_opacity: opacity || 1,
         u_texture: this.texture,
-        u_domain: domain,
+        u_domain: newdomain,
         u_clampLow: clampLow,
         u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
         u_noDataValue: noDataValue,

package/lib/raster/shaders/raster_2d_frag.glsl

@@ -20,6 +20,7 @@ void main() {
   else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))
     gl_FragColor = vec4(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;

package/lib/tile/tileFactory/RasterTile.js

@@ -29,6 +29,8 @@ var _raster = _interopRequireDefault(require("../../raster"));
 
 var _Tile2 = _interopRequireDefault(require("./Tile"));
 
+var _l7Utils = require("@antv/l7-utils");
+
 var _excluded = ["rasterData"];
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -54,7 +56,8 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
     key: "initTileLayer",
     value: function () {
       var _initTileLayer = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var attributes, layerOptions, sourceOptions, layer;
+        var attributes, layerOptions, sourceOptions, _ref, rampColors, domain, layer;
+
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -62,7 +65,8 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
                 attributes = this.parent.getLayerAttributeConfig();
                 layerOptions = this.getLayerOptions();
                 sourceOptions = this.getSourceOption();
-                this.colorTexture = this.parent.textureService.getColorTexture(layerOptions.rampColors);
+                _ref = this.getLayerOptions(), rampColors = _ref.rampColors, domain = _ref.domain;
+                this.colorTexture = this.parent.textureService.getColorTexture(rampColors, domain);
                 layer = new _raster.default((0, _objectSpread2.default)((0, _objectSpread2.default)({}, layerOptions), {}, {
                   colorTexture: this.colorTexture
                 })).source(sourceOptions.data, sourceOptions.options); // 初始化数据映射
@@ -74,13 +78,13 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
 
                   layer[attr]((_attributes$attr = attributes[attr]) === null || _attributes$attr === void 0 ? void 0 : _attributes$attr.field, (_attributes$attr2 = attributes[attr]) === null || _attributes$attr2 === void 0 ? void 0 : _attributes$attr2.values);
                 });
-                _context.next = 8;
+                _context.next = 9;
                 return this.addLayer(layer);
 
-              case 8:
+              case 9:
                 this.isLoaded = true;
 
-              case 9:
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -126,9 +130,11 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
         arg[_key] = arguments[_key];
       }
 
-      var _arg$rampColors = arg.rampColors,
-          rampColors = _arg$rampColors === void 0 ? DEFAULT_COLOR_TEXTURE_OPTION : _arg$rampColors;
-      this.colorTexture = this.parent.textureService.getColorTexture(rampColors);
+      var _ref2 = arg,
+          _ref2$rampColors = _ref2.rampColors,
+          rampColors = _ref2$rampColors === void 0 ? DEFAULT_COLOR_TEXTURE_OPTION : _ref2$rampColors,
+          domain = _ref2.domain;
+      this.colorTexture = this.parent.textureService.getColorTexture(rampColors, domain || (0, _l7Utils.getDefaultDomain)(rampColors));
       this.layers.forEach(function (layer) {
         return layer.style({
           colorTexture: _this.colorTexture

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.12.2",
+  "version": "2.13.1",
   "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.12.2",
-    "@antv/l7-maps": "2.12.2",
-    "@antv/l7-source": "2.12.2",
-    "@antv/l7-utils": "2.12.2",
+    "@antv/l7-core": "2.13.1",
+    "@antv/l7-maps": "2.13.1",
+    "@antv/l7-source": "2.13.1",
+    "@antv/l7-utils": "2.13.1",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "1aa51493b0899f6b28f0477dcd6c56db19ce0669",
+  "gitHead": "6a7cbf5974ee1b3f38f926b3eaac97a144013ef2",
   "publishConfig": {
     "access": "public"
   }

package/es/line/models/tile.d.ts

@@ -1,8 +0,0 @@
-import { IModel, IModelUniform } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class LineModel extends BaseModel {
-    getUninforms(): IModelUniform;
-    initModels(): Promise<IModel[]>;
-    buildModels(): Promise<IModel[]>;
-    protected registerBuiltinAttributes(): void;
-}

package/es/line/models/tile.js

@@ -1,201 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _inherits from "@babel/runtime/helpers/esm/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-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; } }
-
-import { AttributeType, gl } from '@antv/l7-core';
-import { getMask, rgb2arr } from '@antv/l7-utils';
-import BaseModel from "../../core/BaseModel";
-import { LineTriangulation } from "../../core/triangulation";
-
-/* babel-plugin-inline-import '../../shader/minify_picking_frag.glsl' */
-var line_tile_frag = "uniform float u_opacity : 1.0;\nvarying vec4 v_color;\n\n#pragma include \"picking\"\n\nvoid main() {\n  gl_FragColor = v_color;\n  gl_FragColor.a *= u_opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
-
-/* babel-plugin-inline-import '../shaders/tile/line_tile_vert.glsl' */
-var line_tile_vert = "attribute float a_Miter;\nattribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec3 a_Normal;\nattribute vec3 a_Position;\n\n// uniform vec2 u_tileOrigin;\n// uniform float u_coord;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvarying vec4 v_color;\n\nvoid main() {\n  v_color = a_Color;\n\n  vec3 size = a_Miter * setPickingSize(a_Size.x) * reverse_offset_normal(a_Normal);\n  \n  vec2 offset = project_pixel(size.xy);\n\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n  // if(u_coord > 0.0) { // \u4F7F\u7528\u7ECF\u7EAC\u5EA6\u5750\u6807\n      if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy + offset, 0.0, 1.0));\n    } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n    }\n  // } else { // \u4F7F\u7528\u504F\u79FB\u5750\u6807\n  //   vec2 pointPos = a_Position.xy;\n  //   vec4 tileWorld = vec4(project_mvt_offset_position(vec4(u_tileOrigin, 0.0, 1.0)).xyz, 1.0); // \u74E6\u7247\u8D77\u59CB\u70B9\u7684\u4E16\u754C\u5750\u6807\n\n  //   vec2 pointOffset =  pointPos *  pow(2.0, u_Zoom); // \u74E6\u7247\u5185\u7684\u70B9\u7684\u504F\u79FB\u5750\u6807\n    \n  //   tileWorld.xy += pointOffset;\n\n  //   tileWorld.xy += offset;\n\n  //   if (u_CoordinateSystem == COORDINATE_SYSTEM_METER_OFFSET || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n  //     // Needs to be divided with project_uCommonUnitsPerMeter\n  //     tileWorld.w *= u_PixelsPerMeter.z;\n  //   }\n  //   gl_Position = u_ViewProjectionMatrix * tileWorld + u_ViewportCenterProjection;\n  // }\n\n  setPickingColor(a_PickingColor);\n}\n";
-
-/* babel-plugin-inline-import '../../shader/minify_frag.glsl' */
-var line_tile_map_frag = "uniform float u_opacity : 1.0;\nuniform vec4 u_color;\n\nvoid main() {\n  gl_FragColor = u_color;\n  gl_FragColor.a *= u_opacity;\n}\n";
-
-/* babel-plugin-inline-import '../shaders/tile/line_tile_map_vert.glsl' */
-var line_tile_map_vert = "attribute float a_Miter;\nattribute vec4 a_Color;\nattribute vec3 a_Normal;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_size;\n\n#pragma include \"projection\"\n\nvoid main() {\n\n  vec3 size = a_Miter * u_size * reverse_offset_normal(a_Normal);\n  \n  vec2 offset = project_pixel(size.xy);\n\n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xy + offset, 0.0, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n  }\n}\n";
-
-var LineModel = /*#__PURE__*/function (_BaseModel) {
-  _inherits(LineModel, _BaseModel);
-
-  var _super = _createSuper(LineModel);
-
-  function LineModel() {
-    _classCallCheck(this, LineModel);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(LineModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
-      var _ref = this.layer.getLayerConfig(),
-          _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-          usage = _ref.usage,
-          _ref$color = _ref.color,
-          color = _ref$color === void 0 ? '#fff' : _ref$color,
-          _ref$size = _ref.size,
-          size = _ref$size === void 0 ? 1 : _ref$size;
-
-      return {
-        // u_tileOrigin: tileOrigin || [0, 0],
-        // u_coord: coord === 'lnglat' ? 1.0 : 0.0,
-        u_opacity: Number(opacity),
-        u_color: usage === 'basemap' ? rgb2arr(color) : [0, 0, 0, 0],
-        u_size: usage === 'basemap' ? size : 1
-      };
-    }
-  }, {
-    key: "initModels",
-    value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return this.buildModels();
-
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-
-      return initModels;
-    }()
-  }, {
-    key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, _ref2$depth, depth, usage, model;
-
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside, _ref2$depth = _ref2.depth, depth = _ref2$depth === void 0 ? false : _ref2$depth, usage = _ref2.usage;
-                this.layer.triangulation = LineTriangulation;
-                _context2.next = 4;
-                return this.layer.buildLayerModel({
-                  moduleName: 'lineTile_' + usage,
-                  vertexShader: usage === 'basemap' ? line_tile_map_vert : line_tile_vert,
-                  fragmentShader: usage === 'basemap' ? line_tile_map_frag : line_tile_frag,
-                  triangulation: LineTriangulation,
-                  blend: this.getBlend(),
-                  depth: {
-                    enable: depth
-                  },
-                  stencil: getMask(mask, maskInside),
-                  pick: usage !== 'basemap'
-                });
-
-              case 4:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 6:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      var _this$layer$getLayerC = this.layer.getLayerConfig(),
-          usage = _this$layer$getLayerC.usage;
-
-      if (usage !== 'basemap') {
-        this.styleAttributeService.registerStyleAttribute({
-          name: 'size',
-          type: AttributeType.Attribute,
-          descriptor: {
-            name: 'a_Size',
-            buffer: {
-              // give the WebGL driver a hint that this buffer may change
-              usage: gl.DYNAMIC_DRAW,
-              data: [],
-              type: gl.FLOAT
-            },
-            size: 2,
-            update: function update(feature) {
-              var _feature$size = feature.size,
-                  size = _feature$size === void 0 ? 1 : _feature$size;
-              return Array.isArray(size) ? [size[0], size[1]] : [size, 0];
-            }
-          }
-        });
-      }
-
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'normal',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Normal',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.STATIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 3,
-          update: function update(feature, featureIdx, vertex, attributeIdx, normal) {
-            return normal;
-          }
-        }
-      });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'miter',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Miter',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.STATIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature, featureIdx, vertex) {
-            return [vertex[4]];
-          }
-        }
-      });
-    }
-  }]);
-
-  return LineModel;
-}(BaseModel);
-
-export { LineModel as default };