@antv/l7-layers 2.17.2 → 2.17.4

package/es/earth/utils.js

@@ -1,17 +1,16 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { mat4, vec3 } from 'gl-matrix';
-// 该文件专门记录地球模式的数值
-
+import { mat4, vec3 } from 'gl-matrix'; // 该文件专门记录地球模式的数值
 // 地球网格半径
+
 export var EARTH_RADIUS = 100;
 export var EARTH_SEGMENTS = 36;
 export var EARTH_RADIUS_OUTER = 40;
-
 /**
  * 角度转弧度
  * @param deg
  * @returns
  */
+
 function torad(deg) {
   return deg / 180 * Math.acos(-1);
 }
@@ -21,25 +20,26 @@ function torad(deg) {
  * @param latitude 纬度
  * @param radius 半径
  */
+
+
 export function lglt2xyz(lnglat) {
   // TODO: + Math.PI/2 是为了对齐坐标
   var lng = torad(lnglat[0]) + Math.PI / 2;
-  var lat = torad(lnglat[1]);
+  var lat = torad(lnglat[1]); // TODO: 手动增加一些偏移，减轻面的冲突
 
-  // TODO: 手动增加一些偏移，减轻面的冲突
   var radius = EARTH_RADIUS + Math.random() * 0.4;
   var z = radius * Math.cos(lat) * Math.cos(lng);
   var x = radius * Math.cos(lat) * Math.sin(lng);
   var y = radius * Math.sin(lat);
   return [x, y, z];
 }
-
 /**
  * 构建地球球体网格
  * @param radius
  * @param opt
  * @returns
  */
+
 export function primitiveSphere(radius, opt) {
   var matRotY = mat4.create();
   var matRotZ = mat4.create();
@@ -56,9 +56,11 @@ export function primitiveSphere(radius, opt) {
   var positionsArr = [];
   var normalArr = [];
   var uvs = [];
+
   for (var zRotationStep = 0; zRotationStep <= totalZRotationSteps; zRotationStep++) {
     var normalizedZ = zRotationStep / totalZRotationSteps;
     var angleZ = normalizedZ * Math.PI;
+
     for (var yRotationStep = 0; yRotationStep <= totalYRotationSteps; yRotationStep++) {
       var normalizedY = yRotationStep / totalYRotationSteps;
       var angleY = normalizedY * Math.PI * 2;
@@ -73,14 +75,15 @@ export function primitiveSphere(radius, opt) {
       positionsArr.push.apply(positionsArr, _toConsumableArray(tmpVec3.slice()));
       vec3.normalize(tmpVec3, tmpVec3);
       normalArr.push.apply(normalArr, _toConsumableArray(tmpVec3.slice()));
-      uvs.push([normalizedY, 1 - normalizedZ]);
+      uvs.push([normalizedY, 1 - normalizedZ]); // position 和 uv 一起存储
 
-      // position 和 uv 一起存储
       positionsArr.push(normalizedY, 1 - normalizedZ);
     }
+
     if (zRotationStep > 0) {
       var verticesCount = positions.length;
       var firstIndex = verticesCount - 2 * (totalYRotationSteps + 1);
+
       for (; firstIndex + totalYRotationSteps + 2 < verticesCount; firstIndex++) {
         indices.push([firstIndex, firstIndex + 1, firstIndex + totalYRotationSteps + 1]);
         indicesArr.push(firstIndex, firstIndex + 1, firstIndex + totalYRotationSteps + 1);
@@ -89,6 +92,7 @@ export function primitiveSphere(radius, opt) {
       }
     }
   }
+
   return {
     cells: indices,
     positions: positions,

package/es/heatmap/index.js

@@ -7,52 +7,71 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 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 BaseLayer from "../core/BaseLayer";
 import HeatMapModels from "./models";
+
 var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(HeatMapLayer, _BaseLayer);
+
   var _super = _createSuper(HeatMapLayer);
+
   function HeatMapLayer() {
     var _this;
+
     _classCallCheck(this, HeatMapLayer);
+
     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), "type", 'HeatMapLayer');
+
     return _this;
   }
+
   _createClass(HeatMapLayer, [{
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var shape;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              shape = this.getModelType();
-              this.layerModel = new HeatMapModels[shape](this);
-              _context.next = 4;
-              return this.initLayerModels();
-            case 4:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                shape = this.getModelType();
+                this.layerModel = new HeatMapModels[shape](this);
+                _context.next = 4;
+                return this.initLayerModels();
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
     key: "renderModels",
     value: function renderModels() {
       var _this2 = this;
+
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var shape = this.getModelType();
+
       if (shape === 'heatmap') {
         if (this.layerModel) {
           this.layerModel.render(options); // 独立的渲染流程
@@ -60,9 +79,11 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
 
         return this;
       }
+
       if (this.encodeDataLength <= 0 && !this.forceRender) {
         return this;
       }
+
       this.hooks.beforeRender.call();
       this.models.forEach(function (model) {
         return model.draw({
@@ -87,24 +108,33 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
     key: "getModelType",
     value: function getModelType() {
       var _shapeAttribute$scale;
+
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
+
       var _this$getLayerConfig = this.getLayerConfig(),
-        shape3d = _this$getLayerConfig.shape3d;
+          shape3d = _this$getLayerConfig.shape3d;
+
       var source = this.getSource();
       var sourceType = source.data.type;
       var shape = (shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'heatmap';
+
       if (shape === 'heatmap' || shape === 'heatmap3d') {
         return 'heatmap';
       }
+
       if (sourceType === 'hexagon') {
         return (shape3d === null || shape3d === void 0 ? void 0 : shape3d.indexOf(shape)) === -1 ? 'hexagon' : 'grid3d';
       }
+
       if (sourceType === 'grid') {
         return (shape3d === null || shape3d === void 0 ? void 0 : shape3d.indexOf(shape)) === -1 ? 'grid' : 'grid3d';
       }
+
       return 'heatmap';
     }
   }]);
+
   return HeatMapLayer;
 }(BaseLayer);
+
 export { HeatMapLayer as default };

package/es/heatmap/models/grid.js

@@ -5,29 +5,40 @@ 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 BaseModel from "../../core/BaseModel";
 import { HeatmapGridTriangulation } from "../../core/triangulation";
+
 /* babel-plugin-inline-import '../shaders/grid_vert.glsl' */
 var heatmapGridVert = "precision highp float;\r\n// \u591A\u8FB9\u5F62\u9876\u70B9\u5750\u6807\r\nattribute vec3 a_Position;\r\n// \u591A\u8FB9\u5F62\u7ECF\u7EAC\u5EA6\u5750\u6807\r\nattribute vec3 a_Pos;\r\nattribute float a_Size;\r\nattribute vec4 a_Color;\r\nuniform vec2 u_radius;\r\nuniform float u_coverage: 0.9;\r\nuniform float u_angle: 0;\r\nuniform mat4 u_ModelMatrix;\r\nuniform mat4 u_Mvp;\r\nvarying vec4 v_color;\r\n\r\nuniform vec2 u_sceneCenterMercator;\r\n\r\n#pragma include \"projection\"\r\n#pragma include \"project\"\r\n#pragma include \"picking\"\r\n\r\nvoid main() {\r\n  v_color = a_Color;\r\n\r\n  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));\r\n  vec2 offset = a_Position.xy * u_radius * rotationMatrix * u_coverage ;\r\n  // vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n  // vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\r\n  // gl_Position = project_common_position_to_clipspace(project_pos);\r\n\r\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\r\n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator; // \u5C06\u7ECF\u7EAC\u5EA6\u8F6C\u6362\u4E3A\u9AD8\u5FB72.0\u9700\u8981\u7684\u5E73\u9762\u5750\u6807\r\n    vec4 project_pos = project_position(vec4(customLnglat, 0, 1.0));\r\n    gl_Position = u_Mvp * (project_pos);\r\n  } else {\r\n     vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\r\n    vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\r\n    gl_Position = project_common_position_to_clipspace(project_pos);\r\n  }\r\n\r\n  setPickingColor(a_PickingColor);\r\n}\r\n";
+
 /* babel-plugin-inline-import '../shaders/hexagon_frag.glsl' */
 var heatmapGridFrag = "precision highp float;\nvarying vec4 v_color;\nuniform float u_opacity: 1;\n\n#pragma include \"picking\"\n\nvoid main() {\n  gl_FragColor = v_color;\n  gl_FragColor.a *= u_opacity;\n\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+
 var GridModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(GridModel, _BaseModel);
+
   var _super = _createSuper(GridModel);
+
   function GridModel() {
     _classCallCheck(this, GridModel);
+
     return _super.apply(this, arguments);
   }
+
   _createClass(GridModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-        opacity = _ref.opacity,
-        coverage = _ref.coverage,
-        angle = _ref.angle;
+          opacity = _ref.opacity,
+          coverage = _ref.coverage,
+          angle = _ref.angle;
+
       return {
         u_opacity: opacity || 1.0,
         u_coverage: coverage || 0.9,
@@ -40,18 +51,23 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
     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:
-              return _context.abrupt("return", this.buildModels());
-            case 1:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                return _context.abrupt("return", this.buildModels());
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }
+
       return initModels;
     }()
   }, {
@@ -60,31 +76,37 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return this.layer.buildLayerModel({
-                moduleName: 'heatmapGrid',
-                vertexShader: heatmapGridVert,
-                fragmentShader: heatmapGridFrag,
-                triangulation: HeatmapGridTriangulation,
-                primitive: gl.TRIANGLES,
-                depth: {
-                  enable: false
-                }
-              });
-            case 2:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 4:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.layer.buildLayerModel({
+                  moduleName: 'heatmapGrid',
+                  vertexShader: heatmapGridVert,
+                  fragmentShader: heatmapGridFrag,
+                  triangulation: HeatmapGridTriangulation,
+                  primitive: gl.TRIANGLES,
+                  depth: {
+                    enable: false
+                  }
+                });
+
+              case 2:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
@@ -110,6 +132,8 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
       });
     }
   }]);
+
   return GridModel;
 }(BaseModel);
+
 export { GridModel as default };

package/es/heatmap/models/grid3d.js

@@ -5,29 +5,40 @@ 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 BaseModel from "../../core/BaseModel";
 import { PointExtrudeTriangulation } from "../../core/triangulation";
+
 /* babel-plugin-inline-import '../shaders/hexagon_3d_vert.glsl' */
 var heatmapGrid3dVert = "precision highp float;\n// \u591A\u8FB9\u5F62\u9876\u70B9\u5750\u6807\nattribute vec3 a_Position;\n// \u591A\u8FB9\u5F62\u7ECF\u7EAC\u5EA6\u5750\u6807\nattribute vec3 a_Pos;\n\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec4 a_Color;\nuniform vec2 u_radius;\nuniform float u_coverage: 0.9;\nuniform float u_angle: 0;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nvarying vec4 v_color;\n\nuniform vec2 u_sceneCenterMercator;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));\n  vec2 offset =(vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage));\n\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n \n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // \u7ECF\u7EAC\u5EA6\n    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator; // \u5C06\u7ECF\u7EAC\u5EA6\u8F6C\u6362\u4E3A\u9AD8\u5FB72.0\u9700\u8981\u7684\u5E73\u9762\u5750\u6807\n    vec4 project_pos = project_position(vec4(customLnglat, a_Position.z * a_Size, 1.0));\n\n    float lightWeight = calc_lighting(project_pos);\n    v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);\n  \n    gl_Position = u_Mvp * vec4(customLnglat , a_Position.z * a_Size, 1.0);\n  } else {\n    vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // \u5B9E\u9645\u7684\u7ECF\u7EAC\u5EA6\n    vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));\n    \n    float lightWeight = calc_lighting(project_pos);\n    v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);\n    \n    gl_Position = project_common_position_to_clipspace(project_pos);\n  }\n\n\n\n  setPickingColor(a_PickingColor);\n}\n";
+
 /* babel-plugin-inline-import '../shaders/hexagon_frag.glsl' */
 var heatmapGridFrag = "precision highp float;\nvarying vec4 v_color;\nuniform float u_opacity: 1;\n\n#pragma include \"picking\"\n\nvoid main() {\n  gl_FragColor = v_color;\n  gl_FragColor.a *= u_opacity;\n\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+
 var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(Grid3DModel, _BaseModel);
+
   var _super = _createSuper(Grid3DModel);
+
   function Grid3DModel() {
     _classCallCheck(this, Grid3DModel);
+
     return _super.apply(this, arguments);
   }
+
   _createClass(Grid3DModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-        opacity = _ref.opacity,
-        coverage = _ref.coverage,
-        angle = _ref.angle;
+          opacity = _ref.opacity,
+          coverage = _ref.coverage,
+          angle = _ref.angle;
+
       return {
         u_opacity: opacity || 1.0,
         u_coverage: coverage || 1.0,
@@ -40,18 +51,23 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
     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:
-              return _context.abrupt("return", this.buildModels());
-            case 1:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                return _context.abrupt("return", this.buildModels());
+
+              case 1:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }
+
       return initModels;
     }()
   }, {
@@ -60,31 +76,37 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return this.layer.buildLayerModel({
-                moduleName: 'heatmapGrid3d',
-                vertexShader: heatmapGrid3dVert,
-                fragmentShader: heatmapGridFrag,
-                triangulation: PointExtrudeTriangulation,
-                primitive: gl.TRIANGLES,
-                depth: {
-                  enable: true
-                }
-              });
-            case 2:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 4:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.layer.buildLayerModel({
+                  moduleName: 'heatmapGrid3d',
+                  vertexShader: heatmapGrid3dVert,
+                  fragmentShader: heatmapGridFrag,
+                  triangulation: PointExtrudeTriangulation,
+                  primitive: gl.TRIANGLES,
+                  depth: {
+                    enable: true
+                  }
+                });
+
+              case 2:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
@@ -143,6 +165,8 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
       });
     }
   }]);
+
   return Grid3DModel;
 }(BaseModel);
+
 export { Grid3DModel as default };