@antv/l7-layers 2.21.1 → 2.21.3

package/lib/heatmap/models/hexagon.d.ts

@@ -0,0 +1,15 @@
+import type { IModel, IModelUniform } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class HexagonModel extends BaseModel {
+    getUninforms(): IModelUniform;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
+    protected registerBuiltinAttributes(): void;
+}

package/lib/heatmap/models/hexagon.js

@@ -5,130 +5,80 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-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 _l7Core = require("@antv/l7-core");
-var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
-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; } }
 /* babel-plugin-inline-import '../shaders/hexagon/hexagon_frag.glsl' */
-var hexagon_frag = "in vec4 v_color;\n\n#pragma include \"picking\"\nout vec4 outputColor;\nvoid main() {\n  outputColor = v_color;\n  outputColor = filterColor(outputColor);\n}\n";
+const hexagon_frag = "in vec4 v_color;\n\n#pragma include \"picking\"\nout vec4 outputColor;\nvoid main() {\n  outputColor = v_color;\n  outputColor = filterColor(outputColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/hexagon/hexagon_vert.glsl' */
-var hexagon_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 10) in vec3 a_Pos;\n\nlayout(std140) uniform commonUniforms {\n    vec2 u_radius;\n    float u_opacity;\n    float u_coverage;\n    float u_angle;\n};\n\nout vec4 v_color;\n\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"picking\"\n\nvoid main() {\n  v_color = a_Color;\n  v_color.a *= u_opacity;\n    \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  vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\n \n  // vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0., 1.0));\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    // gl_Position = u_Mvp * (vec4(project_pos.xy, 0., 1.0));\n    // gl_Position = u_Mvp * (vec4(a_Pos.xy + offset, 0., 1.0));\n    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator;\n    vec4 project_pos = project_position(vec4(customLnglat, 0, 1.0));\n    gl_Position = u_Mvp * vec4(project_pos.xy, 0.0, 1.0);\n  } else {\n    vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0., 1.0));\n  }\n  setPickingColor(a_PickingColor);\n}\n";
-var HexagonModel = exports.default = /*#__PURE__*/function (_BaseModel) {
-  (0, _inherits2.default)(HexagonModel, _BaseModel);
-  var _super = _createSuper(HexagonModel);
-  function HexagonModel() {
-    (0, _classCallCheck2.default)(this, HexagonModel);
-    return _super.apply(this, arguments);
+const hexagon_vert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 10) in vec3 a_Pos;\n\nlayout(std140) uniform commonUniforms {\n    vec2 u_radius;\n    float u_opacity;\n    float u_coverage;\n    float u_angle;\n};\n\nout vec4 v_color;\n\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"picking\"\n\nvoid main() {\n  v_color = a_Color;\n  v_color.a *= u_opacity;\n    \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  vec2 lnglat = unProjectFlat(a_Pos.xy + offset);\n \n  // vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0., 1.0));\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    // gl_Position = u_Mvp * (vec4(project_pos.xy, 0., 1.0));\n    // gl_Position = u_Mvp * (vec4(a_Pos.xy + offset, 0., 1.0));\n    vec2 customLnglat = customProject(lnglat) - u_sceneCenterMercator;\n    vec4 project_pos = project_position(vec4(customLnglat, 0, 1.0));\n    gl_Position = u_Mvp * vec4(project_pos.xy, 0.0, 1.0);\n  } else {\n    vec4 project_pos = project_position(vec4(lnglat, 0, 1.0));\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, 0., 1.0));\n  }\n  setPickingColor(a_PickingColor);\n}\n";
+class HexagonModel extends _BaseModel.default {
+  getUninforms() {
+    const commoninfo = this.getCommonUniformsInfo();
+    const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+    this.updateStyleUnifoms();
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, commoninfo.uniformsOption), attributeInfo.uniformsOption);
   }
-  (0, _createClass2.default)(HexagonModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
-      var commoninfo = this.getCommonUniformsInfo();
-      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
-      this.updateStyleUnifoms();
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, commoninfo.uniformsOption), attributeInfo.uniformsOption);
-    }
-  }, {
-    key: "getCommonUniformsInfo",
-    value: function getCommonUniformsInfo() {
-      var _ref = this.layer.getLayerConfig(),
-        opacity = _ref.opacity,
-        coverage = _ref.coverage,
-        angle = _ref.angle;
-      var commonOptions = {
-        u_radius: [this.layer.getSource().data.xOffset, this.layer.getSource().data.yOffset],
-        u_opacity: opacity || 1.0,
-        u_coverage: coverage || 0.9,
-        u_angle: angle || 0
-      };
-      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-      return commonBufferInfo;
-    }
-  }, {
-    key: "initModels",
-    value: function () {
-      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        return _regenerator.default.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();
-          }
-        }, _callee, this);
-      }));
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-      return initModels;
-    }()
-  }, {
-    key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var model;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              this.initUniformsBuffer();
-              _context2.next = 3;
-              return this.layer.buildLayerModel({
-                moduleName: 'heatmapHexagon',
-                vertexShader: hexagon_vert,
-                fragmentShader: hexagon_frag,
-                triangulation: _triangulation.HeatmapGridTriangulation,
-                depth: {
-                  enable: false
-                },
-                primitive: _l7Core.gl.TRIANGLES
-              });
-            case 3:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 5:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-      return buildModels;
-    }()
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'pos',
-        // 顶点经纬度位置
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Pos',
-          shaderLocation: 10,
-          buffer: {
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 3,
-          update: function update(feature) {
-            var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
-            return [coordinates[0], coordinates[1], 0];
-          }
-        }
+  getCommonUniformsInfo() {
+    const {
+      opacity,
+      coverage,
+      angle
+    } = this.layer.getLayerConfig();
+    const commonOptions = {
+      u_radius: [this.layer.getSource().data.xOffset, this.layer.getSource().data.yOffset],
+      u_opacity: opacity || 1.0,
+      u_coverage: coverage || 0.9,
+      u_angle: angle || 0
+    };
+    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+    return commonBufferInfo;
+  }
+  initModels() {
+    var _this = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      return _this.buildModels();
+    })();
+  }
+  buildModels() {
+    var _this2 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      _this2.initUniformsBuffer();
+      const model = yield _this2.layer.buildLayerModel({
+        moduleName: 'heatmapHexagon',
+        vertexShader: hexagon_vert,
+        fragmentShader: hexagon_frag,
+        triangulation: _triangulation.HeatmapGridTriangulation,
+        depth: {
+          enable: false
+        },
+        primitive: _l7Core.gl.TRIANGLES
       });
-    }
-  }]);
-  return HexagonModel;
-}(_BaseModel2.default);
+      return [model];
+    })();
+  }
+  registerBuiltinAttributes() {
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'pos',
+      // 顶点经纬度位置
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Pos',
+        shaderLocation: 10,
+        buffer: {
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 3,
+        update: feature => {
+          const coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
+          return [coordinates[0], coordinates[1], 0];
+        }
+      }
+    });
+  }
+}
+exports.default = HexagonModel;

package/lib/heatmap/models/index.d.ts

@@ -0,0 +1,5 @@
+export type HeatMapModelType = 'heatmap' | 'heatmap3d' | 'hexagon' | 'grid' | 'grid3d';
+declare const HeatMapModels: {
+    [key in HeatMapModelType]: any;
+};
+export default HeatMapModels;

package/lib/heatmap/models/index.js

@@ -9,7 +9,7 @@ var _grid = _interopRequireDefault(require("./grid"));
 var _grid3d = _interopRequireDefault(require("./grid3d"));
 var _heatmap = _interopRequireDefault(require("./heatmap"));
 var _hexagon = _interopRequireDefault(require("./hexagon"));
-var HeatMapModels = {
+const HeatMapModels = {
   heatmap: _heatmap.default,
   heatmap3d: _heatmap.default,
   grid: _grid.default,

package/lib/heatmap/triangulation.d.ts

@@ -0,0 +1,5 @@
+export declare function heatMap3DTriangulation(width: number, height: number): {
+    vertices: number[];
+    indices: number[];
+    uvs: number[];
+};

package/lib/heatmap/triangulation.js

@@ -5,35 +5,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.heatMap3DTriangulation = heatMap3DTriangulation;
 function heatMap3DTriangulation(width, height) {
-  var indices = [];
-  var vertices = [];
-  var uvs = [];
-  var gridX1 = width + 1;
-  var gridY1 = height + 1;
-  var widthHalf = width / 2;
-  var heightHalf = height / 2;
-  for (var iy = 0; iy < gridY1; iy++) {
-    var y = iy - heightHalf;
-    for (var ix = 0; ix < gridX1; ix++) {
-      var x = ix - widthHalf;
+  const indices = [];
+  const vertices = [];
+  const uvs = [];
+  const gridX1 = width + 1;
+  const gridY1 = height + 1;
+  const widthHalf = width / 2;
+  const heightHalf = height / 2;
+  for (let iy = 0; iy < gridY1; iy++) {
+    const y = iy - heightHalf;
+    for (let ix = 0; ix < gridX1; ix++) {
+      const x = ix - widthHalf;
       vertices.push(x / widthHalf, -y / heightHalf, 0);
       uvs.push(ix / width);
       uvs.push(1 - iy / height);
     }
   }
-  for (var _iy = 0; _iy < height; _iy++) {
-    for (var _ix = 0; _ix < width; _ix++) {
-      var a = _ix + gridX1 * _iy;
-      var b = _ix + gridX1 * (_iy + 1);
-      var c = _ix + 1 + gridX1 * (_iy + 1);
-      var d = _ix + 1 + gridX1 * _iy;
+  for (let iy = 0; iy < height; iy++) {
+    for (let ix = 0; ix < width; ix++) {
+      const a = ix + gridX1 * iy;
+      const b = ix + gridX1 * (iy + 1);
+      const c = ix + 1 + gridX1 * (iy + 1);
+      const d = ix + 1 + gridX1 * iy;
       indices.push(a, b, d);
       indices.push(b, c, d);
     }
   }
   return {
-    vertices: vertices,
-    indices: indices,
-    uvs: uvs
+    vertices,
+    indices,
+    uvs
   };
 }

package/lib/image/index.d.ts

@@ -0,0 +1,9 @@
+import BaseLayer from '../core/BaseLayer';
+import type { IImageLayerStyleOptions } from '../core/interface';
+import type { ImageModelType } from './models/index';
+export default class ImageLayer extends BaseLayer<IImageLayerStyleOptions> {
+    type: string;
+    buildModels(): Promise<void>;
+    protected getDefaultConfig(): {};
+    getModelType(): ImageModelType;
+}

package/lib/image/index.js

@@ -5,69 +5,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-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 _BaseLayer = _interopRequireDefault(require("../core/BaseLayer"));
 var _index = _interopRequireDefault(require("./models/index"));
-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 ImageLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
-  (0, _inherits2.default)(ImageLayer, _BaseLayer);
-  var _super = _createSuper(ImageLayer);
-  function ImageLayer() {
-    var _this;
-    (0, _classCallCheck2.default)(this, ImageLayer);
-    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));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'ImageLayer');
-    return _this;
+class ImageLayer extends _BaseLayer.default {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "type", 'ImageLayer');
   }
-  (0, _createClass2.default)(ImageLayer, [{
-    key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var modelType;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              modelType = this.getModelType();
-              this.layerModel = new _index.default[modelType](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: "getDefaultConfig",
-    value: function getDefaultConfig() {
-      var type = this.getModelType();
-      var defaultConfig = {
-        image: {}
-      };
-      return defaultConfig[type];
-    }
-  }, {
-    key: "getModelType",
-    value: function getModelType() {
-      return 'image';
-    }
-  }]);
-  return ImageLayer;
-}(_BaseLayer2.default);
+  buildModels() {
+    var _this = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      const modelType = _this.getModelType();
+      _this.layerModel = new _index.default[modelType](_this);
+      yield _this.initLayerModels();
+    })();
+  }
+  getDefaultConfig() {
+    const type = this.getModelType();
+    const defaultConfig = {
+      image: {}
+    };
+    return defaultConfig[type];
+  }
+  getModelType() {
+    return 'image';
+  }
+}
+exports.default = ImageLayer;

package/lib/image/models/image.d.ts

@@ -0,0 +1,17 @@
+import type { IModel, ITexture2D } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class ImageModel extends BaseModel {
+    protected texture: ITexture2D;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
+    initModels(): Promise<IModel[]>;
+    clearModels(): void;
+    private loadTexture;
+    buildModels(): Promise<IModel[]>;
+    protected registerBuiltinAttributes(): void;
+}