@antv/l7-layers 2.9.26-alpha.0 → 2.9.26-alpha.1

package/es/point/models/tile.js

@@ -0,0 +1,309 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+
+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 { getCullFace, getMask } from '@antv/l7-utils';
+import BaseModel from "../../core/BaseModel";
+import { PointFillTriangulation } from "../../core/triangulation";
+
+/* babel-plugin-inline-import '../shaders/tile/fill_tile_frag.glsl' */
+var point_tile_frag = "uniform float u_additive;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nvoid main() {\n  int shape = int(floor(v_data.w + 0.5));\n\n  vec4 textrueStroke = vec4(\n    styleMappingMat[1][0],\n    styleMappingMat[1][1],\n    styleMappingMat[1][2],\n    styleMappingMat[1][3]\n  );\n\n  float opacity = styleMappingMat[0][0];\n  float stroke_opacity = styleMappingMat[0][1];\n  float strokeWidth = styleMappingMat[0][2];\n  vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius + strokeWidth);\n\n  float outer_df;\n  float inner_df;\n  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n  if (shape == 0) {\n    outer_df = sdCircle(v_data.xy, 1.0);\n    inner_df = sdCircle(v_data.xy, r);\n  } else if (shape == 1) {\n    outer_df = sdEquilateralTriangle(1.1 * v_data.xy);\n    inner_df = sdEquilateralTriangle(1.1 / r * v_data.xy);\n  } else if (shape == 2) {\n    outer_df = sdBox(v_data.xy, vec2(1.));\n    inner_df = sdBox(v_data.xy, vec2(r));\n  } else if (shape == 3) {\n    outer_df = sdPentagon(v_data.xy, 0.8);\n    inner_df = sdPentagon(v_data.xy, r * 0.8);\n  } else if (shape == 4) {\n    outer_df = sdHexagon(v_data.xy, 0.8);\n    inner_df = sdHexagon(v_data.xy, r * 0.8);\n  } else if (shape == 5) {\n    outer_df = sdOctogon(v_data.xy, 1.0);\n    inner_df = sdOctogon(v_data.xy, r);\n  } else if (shape == 6) {\n    outer_df = sdHexagram(v_data.xy, 0.52);\n    inner_df = sdHexagram(v_data.xy, r * 0.52);\n  } else if (shape == 7) {\n    outer_df = sdRhombus(v_data.xy, vec2(1.0));\n    inner_df = sdRhombus(v_data.xy, vec2(r));\n  } else if (shape == 8) {\n    outer_df = sdVesica(v_data.xy, 1.1, 0.8);\n    inner_df = sdVesica(v_data.xy, r * 1.1, r * 0.8);\n  }\n\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = strokeWidth < 0.01 ? 0.0 : smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n\n  if(strokeWidth < 0.01) {\n    gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);\n  } else {\n    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t);\n  }\n\n  if(u_additive > 0.0) {\n    gl_FragColor *= opacity_t;\n    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);\n  } else {\n    gl_FragColor.a *= opacity_t;\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
+
+/* babel-plugin-inline-import '../shaders/tile/fill_tile_vert.glsl' */
+var point_tile_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\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 mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_isMeter;\n\nuniform vec2 u_tileOrigin;\nuniform float u_coord;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\nuniform vec2 u_offsets;\n\nuniform float u_blur : 0.0;\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  float newSize = setPickingSize(a_Size);\n\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 strokeOpacityAndOffset = calStrokeOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][1] = strokeOpacityAndOffset.r;\n  textureOffset = strokeOpacityAndOffset.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  vec2 textrueOffsets = vec2(0.0, 0.0);\n  if(hasOffsets()) {\n    vec2 valueXPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.r = pos2value(valueXPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n\n    vec2 valueYPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.g = pos2value(valueYPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n  } else {\n    textrueOffsets = u_offsets;\n  }\n\n  // cal style mapping\n\n  v_color = a_Color;\n  v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, u_blur);\n\n  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + textrueOffsets);\n  vec3 aPosition = a_Position;\n  if(u_isMeter < 1.0) {\n    // \u4E0D\u4EE5\u7C73\u4E3A\u5B9E\u9645\u5355\u4F4D\n    offset = project_pixel(offset);\n  } else {\n    // \u4EE5\u7C73\u4E3A\u5B9E\u9645\u5355\u4F4D\n    antialiasblur *= pow(19.0 - u_Zoom, 2.0);\n    antialiasblur = max(antialiasblur, -0.01);\n    // offset *= 0.5;\n\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      aPosition.xy += offset;\n      offset.x = 0.0;\n      offset.y = 0.0;\n    }\n  }\n\n  v_data = vec4(extrude.x, extrude.y, antialiasblur,shape_type);\n\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n\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  }\n\nif(u_coord > 0.0) {\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 {\n  gl_PointSize = 24.0;\n  vec2 pointPos = a_Position.xy;\n  vec4 world = 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  world.xy += offset;\n  world.xy += pointOffset;\n\n  if (u_CoordinateSystem == COORDINATE_SYSTEM_METER_OFFSET || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    // Needs to be divided with project_uCommonUnitsPerMeter\n    world.w *= u_PixelsPerMeter.z;\n  }\n\n  gl_Position = u_ViewProjectionMatrix * world + u_ViewportCenterProjection;\n}\n\n \n  setPickingColor(a_PickingColor);\n\n\n}\n";
+import { Version } from '@antv/l7-maps';
+
+var FillModel = /*#__PURE__*/function (_BaseModel) {
+  _inherits(FillModel, _BaseModel);
+
+  var _super = _createSuper(FillModel);
+
+  function FillModel() {
+    var _this;
+
+    _classCallCheck(this, FillModel);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _defineProperty(_assertThisInitialized(_this), "meter2coord", 1);
+
+    _defineProperty(_assertThisInitialized(_this), "isMeter", false);
+
+    return _this;
+  }
+
+  _createClass(FillModel, [{
+    key: "getUninforms",
+    value: function getUninforms() {
+      var _ref = this.layer.getLayerConfig(),
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+          _ref$strokeOpacity = _ref.strokeOpacity,
+          strokeOpacity = _ref$strokeOpacity === void 0 ? 1 : _ref$strokeOpacity,
+          _ref$strokeWidth = _ref.strokeWidth,
+          strokeWidth = _ref$strokeWidth === void 0 ? 0 : _ref$strokeWidth,
+          _ref$stroke = _ref.stroke,
+          stroke = _ref$stroke === void 0 ? 'rgba(0,0,0,0)' : _ref$stroke,
+          _ref$offsets = _ref.offsets,
+          offsets = _ref$offsets === void 0 ? [0, 0] : _ref$offsets,
+          blend = _ref.blend,
+          _ref$blur = _ref.blur,
+          blur = _ref$blur === void 0 ? 0 : _ref$blur,
+          _ref$coord = _ref.coord,
+          coord = _ref$coord === void 0 ? 'lnglat' : _ref$coord,
+          tileOrigin = _ref.tileOrigin;
+
+      if (this.dataTextureTest && this.dataTextureNeedUpdate({
+        opacity: opacity,
+        strokeOpacity: strokeOpacity,
+        strokeWidth: strokeWidth,
+        stroke: stroke,
+        offsets: offsets
+      })) {
+        // 判断当前的样式中哪些是需要进行数据映射的，哪些是常量，同时计算用于构建数据纹理的一些中间变量
+        this.judgeStyleAttributes({
+          opacity: opacity,
+          strokeOpacity: strokeOpacity,
+          strokeWidth: strokeWidth,
+          stroke: stroke,
+          offsets: offsets
+        });
+        var encodeData = this.layer.getEncodedData();
+
+        var _this$calDataFrame = this.calDataFrame(this.cellLength, encodeData, this.cellProperties),
+            data = _this$calDataFrame.data,
+            width = _this$calDataFrame.width,
+            height = _this$calDataFrame.height;
+
+        this.rowCount = height; // 当前数据纹理有多少行
+
+        this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
+          flipY: true,
+          data: data,
+          format: gl.LUMINANCE,
+          type: gl.FLOAT,
+          width: width,
+          height: height
+        }) : this.createTexture2D({
+          flipY: true,
+          data: [1],
+          format: gl.LUMINANCE,
+          type: gl.FLOAT,
+          width: 1,
+          height: 1
+        });
+      }
+
+      return {
+        u_tileOrigin: tileOrigin || [0, 0],
+        u_coord: coord === 'lnglat' ? 1.0 : 0.0,
+        u_isMeter: Number(this.isMeter),
+        u_blur: blur,
+        u_additive: blend === 'additive' ? 1.0 : 0.0,
+        u_dataTexture: this.dataTexture,
+        // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
+        u_cellTypeLayout: this.getCellTypeLayout(),
+        u_opacity: Number(opacity),
+        u_stroke_opacity: Number(strokeOpacity),
+        u_stroke_width: Number(strokeWidth),
+        u_stroke_color: this.getStrokeColor(stroke),
+        u_offsets: this.isOffsetStatic(offsets) ? offsets : [0, 0]
+      };
+    }
+  }, {
+    key: "getAttribute",
+    value: function getAttribute() {
+      return this.styleAttributeService.createAttributesAndIndices(this.layer.getEncodedData(), PointFillTriangulation);
+    }
+  }, {
+    key: "initModels",
+    value: function initModels(callbackModel) {
+      var _ref2 = this.layer.getLayerConfig(),
+          _ref2$unit = _ref2.unit,
+          unit = _ref2$unit === void 0 ? 'l7size' : _ref2$unit;
+
+      var version = this.mapService.version;
+
+      if (unit === 'meter' && version !== Version.L7MAP && version !== Version.GLOBEL) {
+        this.isMeter = true;
+        this.calMeter2Coord();
+      }
+
+      this.buildModels(callbackModel);
+    }
+    /**
+     * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
+     * @returns
+     */
+
+  }, {
+    key: "calMeter2Coord",
+    value: function calMeter2Coord() {
+      var _this$layer$getSource = _slicedToArray(this.layer.getSource().extent, 4),
+          minLng = _this$layer$getSource[0],
+          minLat = _this$layer$getSource[1],
+          maxLng = _this$layer$getSource[2],
+          maxLat = _this$layer$getSource[3];
+
+      var center = [(minLng + maxLng) / 2, (minLat + maxLat) / 2];
+      var version = this.mapService.version;
+
+      if (version === Version.MAPBOX && window.mapboxgl.MercatorCoordinate) {
+        var coord = window.mapboxgl.MercatorCoordinate.fromLngLat({
+          lng: center[0],
+          lat: center[1]
+        }, 0);
+        var offsetInMeters = 1;
+        var offsetInMercatorCoordinateUnits = offsetInMeters * coord.meterInMercatorCoordinateUnits();
+        var westCoord = new window.mapboxgl.MercatorCoordinate(coord.x - offsetInMercatorCoordinateUnits, coord.y, coord.z);
+        var westLnglat = westCoord.toLngLat();
+        this.meter2coord = center[0] - westLnglat.lng;
+        return;
+      } // @ts-ignore
+
+
+      var m1 = this.mapService.meterToCoord(center, [minLng, minLat]); // @ts-ignore
+
+      var m2 = this.mapService.meterToCoord(center, [maxLng === minLng ? maxLng + 0.1 : maxLng, maxLat === minLat ? minLat + 0.1 : maxLat]);
+      this.meter2coord = (m1 + m2) / 2;
+
+      if (!this.meter2coord) {
+        // Tip: 兼容单个数据导致的 m1、m2 为 NaN
+        this.meter2coord = 7.70681090738883;
+      }
+    }
+  }, {
+    key: "buildModels",
+    value: function buildModels(callbackModel) {
+      var _ref3 = this.layer.getLayerConfig(),
+          _ref3$mask = _ref3.mask,
+          mask = _ref3$mask === void 0 ? false : _ref3$mask,
+          _ref3$maskInside = _ref3.maskInside,
+          maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside,
+          _ref3$workerEnabled = _ref3.workerEnabled,
+          workerEnabled = _ref3$workerEnabled === void 0 ? false : _ref3$workerEnabled;
+
+      this.layer.triangulation = PointFillTriangulation;
+      this.layer.buildLayerModel({
+        moduleName: 'pointTile',
+        vertexShader: point_tile_vert,
+        fragmentShader: point_tile_frag,
+        triangulation: PointFillTriangulation,
+        depth: {
+          enable: false
+        },
+        cull: {
+          enable: true,
+          face: getCullFace(this.mapService.version)
+        },
+        blend: this.getBlend(),
+        stencil: getMask(mask, maskInside),
+        workerEnabled: workerEnabled,
+        workerOptions: {
+          modelType: 'pointTile'
+        }
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
+  }, {
+    key: "clearModels",
+    value: function clearModels() {
+      var _this$dataTexture;
+
+      (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
+    } // overwrite baseModel func
+
+  }, {
+    key: "registerBuiltinAttributes",
+    value: function registerBuiltinAttributes() {
+      var _this2 = this;
+
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'extrude',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Extrude',
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: gl.DYNAMIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 3,
+          update: function update(feature, featureIdx, vertex, attributeIdx) {
+            var extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];
+            var extrudeIndex = attributeIdx % 4 * 3;
+            return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
+          }
+        }
+      }); // point layer size;
+
+      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: 1,
+          update: function update(feature, featureIdx, vertex, attributeIdx) {
+            var _feature$size = feature.size,
+                size = _feature$size === void 0 ? 5 : _feature$size; // console.log('featureIdx', featureIdx, feature)
+
+            return Array.isArray(size) ? [size[0] * _this2.meter2coord] : [size * _this2.meter2coord];
+          }
+        }
+      }); // point layer size;
+
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'shape',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Shape',
+          buffer: {
+            // give the WebGL driver a hint that this buffer may change
+            usage: gl.DYNAMIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 1,
+          update: function update(feature, featureIdx, vertex, attributeIdx) {
+            var _feature$shape = feature.shape,
+                shape = _feature$shape === void 0 ? 2 : _feature$shape;
+
+            var shape2d = _this2.layer.getLayerConfig().shape2d;
+
+            var shapeIndex = shape2d.indexOf(shape);
+            return [shapeIndex];
+          }
+        }
+      });
+    }
+  }]);
+
+  return FillModel;
+}(BaseModel);
+
+export { FillModel as default };

package/es/point/shaders/animate/wave_frag.glsl

@@ -0,0 +1,65 @@
+
+uniform float u_additive;
+
+varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+
+varying vec4 v_data;
+varying vec4 v_color;
+varying float v_radius;
+uniform float u_time;
+uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
+
+#pragma include "sdf_2d"
+#pragma include "picking"
+
+void main() {
+
+  vec4 textrueStroke = vec4(
+    styleMappingMat[1][0],
+    styleMappingMat[1][1],
+    styleMappingMat[1][2],
+    styleMappingMat[1][3]
+  );
+
+  float opacity = styleMappingMat[0][0];
+
+  lowp float antialiasblur = v_data.z;
+  float r = v_radius / (v_radius);
+
+  float outer_df;
+  float inner_df;
+  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'
+  
+  outer_df = sdCircle(v_data.xy, 1.0);
+  inner_df = sdCircle(v_data.xy, r);
+
+
+  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);
+
+  float color_t = smoothstep(
+    antialiasblur,
+    0.0,
+    inner_df
+  );
+  float PI = 3.14159;
+  float N_RINGS = 3.0;
+  float FREQ = 1.0;
+
+ gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);
+
+  float d = length(v_data.xy);
+  if(d > 0.5) {
+    discard;
+  }
+  float intensity = clamp(cos(d * PI), 0.0, 1.0) * clamp(cos(2.0 * PI * (d * 2.0 * u_aimate.z - u_aimate.y * u_time)), 0.0, 1.0);
+  
+  // TODO: 根据叠加模式选择效果
+  if(u_additive > 0.0) {
+    gl_FragColor *= intensity;
+    // TODO: 优化水波点 blend additive 模式下有的拾取效果 
+    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);
+  } else {
+    gl_FragColor = vec4(gl_FragColor.xyz, gl_FragColor.a * intensity);
+    gl_FragColor = filterColor(gl_FragColor);
+  }
+}

package/es/point/shaders/earth/extrude_frag.glsl

@@ -0,0 +1,44 @@
+varying vec4 v_color;
+uniform float u_opacity: 1.0;
+
+uniform float u_pickLight: 0.0;
+
+#pragma include "picking"
+
+varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+
+uniform float u_linearColor: 0;
+uniform vec4 u_sourceColor;
+uniform vec4 u_targetColor;
+
+uniform float u_opacitylinear: 0.0;
+uniform float u_opacitylinear_dir: 1.0;
+
+void main() {
+  float opacity = styleMappingMat[0][0];
+  float lightWeight = styleMappingMat[1][3];
+  float barLinearZ = styleMappingMat[2][3];
+
+  // 设置圆柱的底色
+  if(u_linearColor == 1.0) { // 使用渐变颜色
+    gl_FragColor = mix(u_sourceColor, u_targetColor, barLinearZ);
+    gl_FragColor.rgb *= lightWeight;
+  } else { // 使用 color 方法传入的颜色
+     gl_FragColor = v_color;
+  }
+
+  // 应用透明度
+  gl_FragColor.a *= opacity;
+
+  // 开启透明度渐变
+  if(u_opacitylinear > 0.0) {
+    gl_FragColor.a *= u_opacitylinear_dir > 0.0 ? (1.0 - barLinearZ): barLinearZ;
+  }
+
+  // picking
+  if(u_pickLight > 0.0) {
+    gl_FragColor = filterColorAlpha(gl_FragColor, lightWeight);
+  } else {
+    gl_FragColor = filterColor(gl_FragColor);
+  }
+}

package/es/point/shaders/earth/extrude_vert.glsl

@@ -0,0 +1,140 @@
+precision highp float;
+
+#define pi 3.1415926535
+#define ambientRatio 0.5
+#define diffuseRatio 0.3
+#define specularRatio 0.2
+
+attribute vec3 a_Position;
+attribute vec3 a_Pos;
+attribute vec4 a_Color;
+attribute vec3 a_Size;
+attribute vec3 a_Normal;
+
+uniform float u_heightfixed: 0.0; // 默认不固定
+uniform float u_globel;
+uniform float u_r;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+varying vec4 v_color;
+
+uniform float u_opacity : 1;
+uniform float u_lightEnable: 1;
+
+varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
+
+#pragma include "styleMapping"
+#pragma include "styleMappingCalOpacity"
+
+#pragma include "projection"
+#pragma include "light"
+#pragma include "picking"
+
+float getYRadian(float x, float z) {
+  if(x > 0.0 && z > 0.0) {
+    return atan(x/z);
+  } else if(x > 0.0 && z <= 0.0){
+    return atan(-z/x) + pi/2.0;
+  } else if(x <= 0.0 && z <= 0.0) {
+    return  pi + atan(x/z); //atan(x/z) + 
+  } else {
+    return atan(z/-x) + pi*3.0/2.0;
+  }
+}
+
+float getXRadian(float y, float r) {
+  return atan(y/r);
+}
+
+void main() {
+
+  // cal style mapping - 数据纹理映射部分的计算
+  styleMappingMat = mat4(
+    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty
+    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA - lightWeight
+    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1] - linearZ(垂直方向 0 - 1 的值)
+    0.0, 0.0, 0.0, 0.0
+  );
+
+  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
+  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
+  float columnWidth = 1.0/columnCount;  // 列宽
+  float rowHeight = 1.0/rowCount;       // 行高
+  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
+  float id = a_vertexId; // 第n个顶点
+  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
+  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
+  
+  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
+  // 按顺序从 cell 中取值、若没有则自动往下取值
+  float textureOffset = 0.0; // 在 cell 中取值的偏移量
+
+  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
+  styleMappingMat[0][0] = opacityAndOffset.r;
+  textureOffset = opacityAndOffset.g;
+  // cal style mapping - 数据纹理映射部分的计算
+  vec3 size = a_Size * a_Position;
+
+  // a_Position.z 是在构建网格的时候传入的标准值 0 - 1，在插值器插值可以获取 0～1 线性渐变的值
+  styleMappingMat[2][3] =  a_Position.z;
+
+  vec3 offset = size; // 控制圆柱体的大小 - 从标准单位圆柱体进行偏移
+  if(u_heightfixed < 1.0) { // 圆柱体不固定高度
+    
+    if (u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {
+      // P20 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减1
+      offset = offset * pow(2.0, (19.0 - u_Zoom));
+    }
+    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+      // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+      offset = offset * pow(2.0, (19.0 - 3.0 - u_Zoom));
+    }
+  } else {// 圆柱体固定高度 （ 处理 mapbox ）
+    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
+      offset *= 4.0/pow(2.0, 21.0 - u_Zoom);
+    }
+  }
+
+
+  vec4 project_pos = project_position(vec4(a_Pos.xy, 0., 1.0));
+
+  // u_r 控制圆柱的生长
+  vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);
+
+  // 圆柱光照效果
+  float lightWeight = 1.0;
+  if(u_lightEnable > 0.0) { // 取消三元表达式，增强健壮性
+    lightWeight = calc_lighting(pos);
+  }
+  styleMappingMat[1][3] = lightWeight;
+
+  v_color =vec4(a_Color.rgb * lightWeight, a_Color.w);
+
+  
+  // 在地球模式下，将原本垂直于 xy 平面的圆柱调整姿态到适应圆的角度
+  //旋转矩阵mx，创建绕x轴旋转矩阵
+  float r = sqrt(a_Pos.z*a_Pos.z + a_Pos.x*a_Pos.x);
+  float xRadian = getXRadian(a_Pos.y, r);
+  float xcos = cos(xRadian);//求解旋转角度余弦值
+  float xsin = sin(xRadian);//求解旋转角度正弦值
+  mat4 mx = mat4(
+    1,0,0,0,  
+    0,xcos,-xsin,0,  
+    0,xsin,xcos,0,  
+    0,0,0,1);
+
+  //旋转矩阵my，创建绕y轴旋转矩阵
+  float yRadian = getYRadian(a_Pos.x, a_Pos.z);
+  float ycos = cos(yRadian);//求解旋转角度余弦值
+  float ysin = sin(yRadian);//求解旋转角度正弦值
+  mat4 my = mat4(
+    ycos,0,-ysin,0,  
+    0,1,0,0,  
+    ysin,0,ycos,0,  
+    0,0,0,1);
+
+  gl_Position = u_ViewProjectionMatrix * vec4(( my * mx *  vec4(a_Position * a_Size, 1.0)).xyz + a_Pos, 1.0);
+  
+
+  setPickingColor(a_PickingColor);
+}

package/es/point/shaders/earth/fill_frag.glsl

@@ -0,0 +1,86 @@
+uniform float u_additive;
+
+varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+
+varying vec4 v_data;
+varying vec4 v_color;
+varying float v_radius;
+
+#pragma include "sdf_2d"
+#pragma include "picking"
+
+
+void main() {
+  int shape = int(floor(v_data.w + 0.5));
+
+  vec4 textrueStroke = vec4(
+    styleMappingMat[1][0],
+    styleMappingMat[1][1],
+    styleMappingMat[1][2],
+    styleMappingMat[1][3]
+  );
+
+  float opacity = styleMappingMat[0][0];
+  float stroke_opacity = styleMappingMat[0][1];
+  float strokeWidth = styleMappingMat[0][2];
+  vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;
+
+  lowp float antialiasblur = v_data.z;
+  float r = v_radius / (v_radius + strokeWidth);
+
+  float outer_df;
+  float inner_df;
+  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'
+  if (shape == 0) {
+    outer_df = sdCircle(v_data.xy, 1.0);
+    inner_df = sdCircle(v_data.xy, r);
+  } else if (shape == 1) {
+    outer_df = sdEquilateralTriangle(1.1 * v_data.xy);
+    inner_df = sdEquilateralTriangle(1.1 / r * v_data.xy);
+  } else if (shape == 2) {
+    outer_df = sdBox(v_data.xy, vec2(1.));
+    inner_df = sdBox(v_data.xy, vec2(r));
+  } else if (shape == 3) {
+    outer_df = sdPentagon(v_data.xy, 0.8);
+    inner_df = sdPentagon(v_data.xy, r * 0.8);
+  } else if (shape == 4) {
+    outer_df = sdHexagon(v_data.xy, 0.8);
+    inner_df = sdHexagon(v_data.xy, r * 0.8);
+  } else if (shape == 5) {
+    outer_df = sdOctogon(v_data.xy, 1.0);
+    inner_df = sdOctogon(v_data.xy, r);
+  } else if (shape == 6) {
+    outer_df = sdHexagram(v_data.xy, 0.52);
+    inner_df = sdHexagram(v_data.xy, r * 0.52);
+  } else if (shape == 7) {
+    outer_df = sdRhombus(v_data.xy, vec2(1.0));
+    inner_df = sdRhombus(v_data.xy, vec2(r));
+  } else if (shape == 8) {
+    outer_df = sdVesica(v_data.xy, 1.1, 0.8);
+    inner_df = sdVesica(v_data.xy, r * 1.1, r * 0.8);
+  }
+
+  if(outer_df > antialiasblur + 0.018) discard;
+
+  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);
+
+  float color_t = strokeWidth < 0.01 ? 0.0 : smoothstep(
+    antialiasblur,
+    0.0,
+    inner_df
+  );
+
+  if(strokeWidth < 0.01) {
+    gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);
+  } else {
+    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t);
+  }
+
+  if(u_additive > 0.0) {
+    gl_FragColor *= opacity_t;
+    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);
+  } else {
+    gl_FragColor.a *= opacity_t;
+    gl_FragColor = filterColor(gl_FragColor);
+  }
+}