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

package/lib/earth/utils.js

@@ -1,116 +1,136 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/earth/utils.ts
-var utils_exports = {};
-__export(utils_exports, {
-  EARTH_RADIUS: () => EARTH_RADIUS,
-  EARTH_RADIUS_OUTER: () => EARTH_RADIUS_OUTER,
-  EARTH_SEGMENTS: () => EARTH_SEGMENTS,
-  lglt2xyz: () => lglt2xyz,
-  primitiveSphere: () => primitiveSphere
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
-var import_gl_matrix = require("gl-matrix");
+exports.EARTH_SEGMENTS = exports.EARTH_RADIUS_OUTER = exports.EARTH_RADIUS = void 0;
+exports.lglt2xyz = lglt2xyz;
+exports.primitiveSphere = primitiveSphere;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _glMatrix = require("gl-matrix");
+
+// 该文件专门记录地球模式的数值
+// 地球网格半径
 var EARTH_RADIUS = 100;
+exports.EARTH_RADIUS = EARTH_RADIUS;
 var EARTH_SEGMENTS = 36;
+exports.EARTH_SEGMENTS = EARTH_SEGMENTS;
 var EARTH_RADIUS_OUTER = 40;
+/**
+ * 角度转弧度
+ * @param deg
+ * @returns
+ */
+
+exports.EARTH_RADIUS_OUTER = EARTH_RADIUS_OUTER;
+
 function torad(deg) {
   return deg / 180 * Math.acos(-1);
 }
+/**
+ * 经纬度转xyz
+ * @param longitude 经度
+ * @param latitude 纬度
+ * @param radius 半径
+ */
+
+
 function lglt2xyz(lnglat) {
-  const lng = torad(lnglat[0]) + Math.PI / 2;
-  const lat = torad(lnglat[1]);
-  const radius = EARTH_RADIUS + Math.random() * 0.4;
-  const z = radius * Math.cos(lat) * Math.cos(lng);
-  const x = radius * Math.cos(lat) * Math.sin(lng);
-  const y = radius * Math.sin(lat);
+  // TODO: + Math.PI/2 是为了对齐坐标
+  var lng = torad(lnglat[0]) + Math.PI / 2;
+  var lat = torad(lnglat[1]); // 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
+ */
+
+
 function primitiveSphere(radius, opt) {
-  const matRotY = import_gl_matrix.mat4.create();
-  const matRotZ = import_gl_matrix.mat4.create();
-  const up = import_gl_matrix.vec3.fromValues(0, 1, 0);
-  const tmpVec3 = import_gl_matrix.vec3.fromValues(0, 0, 0);
+  var matRotY = _glMatrix.mat4.create();
+
+  var matRotZ = _glMatrix.mat4.create();
+
+  var up = _glMatrix.vec3.fromValues(0, 1, 0);
+
+  var tmpVec3 = _glMatrix.vec3.fromValues(0, 0, 0);
+
   opt = opt || {};
-  radius = typeof radius !== "undefined" ? radius : 1;
-  const segments = typeof opt.segments !== "undefined" ? opt.segments : 32;
-  const totalZRotationSteps = 2 + segments;
-  const totalYRotationSteps = 2 * totalZRotationSteps;
-  const indices = [];
-  const indicesArr = [];
-  const positions = [];
-  const positionsArr = [];
-  const normalArr = [];
-  const uvs = [];
-  for (let zRotationStep = 0; zRotationStep <= totalZRotationSteps; zRotationStep++) {
-    const normalizedZ = zRotationStep / totalZRotationSteps;
-    const angleZ = normalizedZ * Math.PI;
-    for (let yRotationStep = 0; yRotationStep <= totalYRotationSteps; yRotationStep++) {
-      const normalizedY = yRotationStep / totalYRotationSteps;
-      const angleY = normalizedY * Math.PI * 2;
-      import_gl_matrix.mat4.identity(matRotZ);
-      import_gl_matrix.mat4.rotateZ(matRotZ, matRotZ, -angleZ);
-      import_gl_matrix.mat4.identity(matRotY);
-      import_gl_matrix.mat4.rotateY(matRotY, matRotY, angleY);
-      import_gl_matrix.vec3.transformMat4(tmpVec3, up, matRotZ);
-      import_gl_matrix.vec3.transformMat4(tmpVec3, tmpVec3, matRotY);
-      import_gl_matrix.vec3.scale(tmpVec3, tmpVec3, -radius);
+  radius = typeof radius !== 'undefined' ? radius : 1;
+  var segments = typeof opt.segments !== 'undefined' ? opt.segments : 32;
+  var totalZRotationSteps = 2 + segments;
+  var totalYRotationSteps = 2 * totalZRotationSteps;
+  var indices = [];
+  var indicesArr = [];
+  var positions = [];
+  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;
+
+      _glMatrix.mat4.identity(matRotZ);
+
+      _glMatrix.mat4.rotateZ(matRotZ, matRotZ, -angleZ);
+
+      _glMatrix.mat4.identity(matRotY);
+
+      _glMatrix.mat4.rotateY(matRotY, matRotY, angleY);
+
+      _glMatrix.vec3.transformMat4(tmpVec3, up, matRotZ);
+
+      _glMatrix.vec3.transformMat4(tmpVec3, tmpVec3, matRotY);
+
+      _glMatrix.vec3.scale(tmpVec3, tmpVec3, -radius);
+
       positions.push(tmpVec3.slice());
-      positionsArr.push(...tmpVec3.slice());
-      import_gl_matrix.vec3.normalize(tmpVec3, tmpVec3);
-      normalArr.push(...tmpVec3.slice());
-      uvs.push([normalizedY, 1 - normalizedZ]);
+      positionsArr.push.apply(positionsArr, (0, _toConsumableArray2.default)(tmpVec3.slice()));
+
+      _glMatrix.vec3.normalize(tmpVec3, tmpVec3);
+
+      normalArr.push.apply(normalArr, (0, _toConsumableArray2.default)(tmpVec3.slice()));
+      uvs.push([normalizedY, 1 - normalizedZ]); // position 和 uv 一起存储
+
       positionsArr.push(normalizedY, 1 - normalizedZ);
     }
+
     if (zRotationStep > 0) {
-      const verticesCount = positions.length;
-      let firstIndex = verticesCount - 2 * (totalYRotationSteps + 1);
+      var verticesCount = positions.length;
+      var firstIndex = verticesCount - 2 * (totalYRotationSteps + 1);
+
       for (; firstIndex + totalYRotationSteps + 2 < verticesCount; firstIndex++) {
-        indices.push([
-          firstIndex,
-          firstIndex + 1,
-          firstIndex + totalYRotationSteps + 1
-        ]);
+        indices.push([firstIndex, firstIndex + 1, firstIndex + totalYRotationSteps + 1]);
         indicesArr.push(firstIndex, firstIndex + 1, firstIndex + totalYRotationSteps + 1);
-        indices.push([
-          firstIndex + totalYRotationSteps + 1,
-          firstIndex + 1,
-          firstIndex + totalYRotationSteps + 2
-        ]);
+        indices.push([firstIndex + totalYRotationSteps + 1, firstIndex + 1, firstIndex + totalYRotationSteps + 2]);
         indicesArr.push(firstIndex + totalYRotationSteps + 1, firstIndex + 1, firstIndex + totalYRotationSteps + 2);
       }
     }
   }
+
   return {
     cells: indices,
-    positions,
-    uvs,
-    positionsArr,
-    indicesArr,
-    normalArr
+    positions: positions,
+    uvs: uvs,
+    positionsArr: positionsArr,
+    indicesArr: indicesArr,
+    normalArr: normalArr
   };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  EARTH_RADIUS,
-  EARTH_RADIUS_OUTER,
-  EARTH_SEGMENTS,
-  lglt2xyz,
-  primitiveSphere
-});
+}

package/lib/heatmap/index.js

@@ -1,101 +1,158 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/heatmap/index.ts
-var heatmap_exports = {};
-__export(heatmap_exports, {
-  default: () => HeatMapLayer
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(heatmap_exports);
-var import_BaseLayer = __toESM(require("../core/BaseLayer"));
-var import_models = __toESM(require("./models"));
-var HeatMapLayer = class extends import_BaseLayer.default {
-  constructor() {
-    super(...arguments);
-    this.type = "HeatMapLayer";
-  }
-  buildModels() {
-    const shape = this.getModelType();
-    this.layerModel = new import_models.default[shape](this);
-    this.layerModel.initModels((models) => {
-      this.models = models;
-      this.renderLayers();
-    });
-  }
-  rebuildModels() {
-    this.layerModel.buildModels((models) => this.models = models);
-  }
-  renderModels() {
-    const shape = this.getModelType();
-    if (shape === "heatmap") {
-      if (this.layerModel) {
-        this.layerModel.render();
-      }
-      return this;
-    }
-    if (this.layerModelNeedUpdate) {
-      this.layerModel.buildModels((models) => this.models = models);
-      this.layerModelNeedUpdate = false;
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
+
+var _models = _interopRequireDefault(require("./models"));
+
+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); }; }
+
+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; } }
+
+var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
+  (0, _inherits2.default)(HeatMapLayer, _BaseLayer);
+
+  var _super = _createSuper(HeatMapLayer);
+
+  function HeatMapLayer() {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, HeatMapLayer);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
-    this.models.forEach((model) => model.draw({
-      uniforms: this.layerModel.getUninforms()
-    }));
-    return this;
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'HeatMapLayer');
+    return _this;
   }
-  updateModelData(data) {
-    if (data.attributes && data.elements) {
-      this.models[0].updateAttributesAndElements(data.attributes, data.elements);
-    } else {
-      console.warn("data error");
+
+  (0, _createClass2.default)(HeatMapLayer, [{
+    key: "buildModels",
+    value: function buildModels() {
+      var _this2 = this;
+
+      var shape = this.getModelType();
+      this.layerModel = new _models.default[shape](this);
+      this.layerModel.initModels(function (models) {
+        _this2.models = models;
+
+        _this2.renderLayers();
+      });
     }
-  }
-  getConfigSchema() {
-    return {
-      properties: {
-        opacity: {
-          type: "number",
-          minimum: 0,
-          maximum: 1
+  }, {
+    key: "rebuildModels",
+    value: function rebuildModels() {
+      var _this3 = this;
+
+      this.layerModel.buildModels(function (models) {
+        return _this3.models = models;
+      });
+    }
+  }, {
+    key: "renderModels",
+    value: function renderModels() {
+      var _this4 = this;
+
+      var shape = this.getModelType();
+
+      if (shape === 'heatmap') {
+        if (this.layerModel) {
+          this.layerModel.render(); // 独立的渲染流程
         }
+
+        return this;
+      }
+
+      if (this.layerModelNeedUpdate) {
+        this.layerModel.buildModels(function (models) {
+          return _this4.models = models;
+        }); // @ts-ignore
+        // this.models = this.layerModel.buildModels();
+
+        this.layerModelNeedUpdate = false;
+      }
+
+      this.models.forEach(function (model) {
+        return model.draw({
+          uniforms: _this4.layerModel.getUninforms()
+        });
+      });
+      return this;
+    }
+  }, {
+    key: "updateModelData",
+    value: function updateModelData(data) {
+      if (data.attributes && data.elements) {
+        this.models[0].updateAttributesAndElements(data.attributes, data.elements);
+      } else {
+        console.warn('data error');
       }
-    };
-  }
-  getModelType() {
-    var _a;
-    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute("shape");
-    const { shape3d } = this.getLayerConfig();
-    const source = this.getSource();
-    const sourceType = source.data.type;
-    const shape = ((_a = shapeAttribute == null ? void 0 : shapeAttribute.scale) == null ? void 0 : _a.field) || "heatmap";
-    if (shape === "heatmap" || shape === "heatmap3d") {
-      return "heatmap";
     }
-    if (sourceType === "hexagon") {
-      return (shape3d == null ? void 0 : shape3d.indexOf(shape)) === -1 ? "hexagon" : "grid3d";
+  }, {
+    key: "getConfigSchema",
+    value: function getConfigSchema() {
+      return {
+        properties: {
+          opacity: {
+            type: 'number',
+            minimum: 0,
+            maximum: 1
+          }
+        }
+      };
     }
-    if (sourceType === "grid") {
-      return (shape3d == null ? void 0 : shape3d.indexOf(shape)) === -1 ? "grid" : "grid3d";
+  }, {
+    key: "getModelType",
+    value: function getModelType() {
+      var _shapeAttribute$scale;
+
+      var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
+
+      var _this$getLayerConfig = this.getLayerConfig(),
+          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 "heatmap";
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+  }]);
+  return HeatMapLayer;
+}(_BaseLayer2.default);
+
+exports.default = HeatMapLayer;