@antv/l7-layers 2.21.1 → 2.21.2

package/lib/point/shape/extrude.d.ts

@@ -0,0 +1,15 @@
+import type { IPath } from '../../core/shape/Path';
+export interface IExtrudeGeomety {
+    positions: number[];
+    index: number[];
+}
+/**
+ * 拉伸多边形顶点，返回拉伸后的顶点信息
+ * @param paths 路径数据组
+ * @param extrude 是否拉伸
+ */
+export default function extrudePolygon(path: IPath[]): IExtrudeGeomety;
+export declare function fillPolygon(points: IPath[]): {
+    positions: number[];
+    index: number[];
+};

package/lib/point/shape/extrude.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = extrudePolygon;
 exports.fillPolygon = fillPolygon;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _earcut = _interopRequireDefault(require("earcut"));
 /**
  * 拉伸多边形顶点，返回拉伸后的顶点信息
@@ -14,47 +13,42 @@ var _earcut = _interopRequireDefault(require("earcut"));
  * @param extrude 是否拉伸
  */
 function extrudePolygon(path) {
-  var p1 = path[0][0];
-  var p2 = path[0][path[0].length - 1];
+  const p1 = path[0][0];
+  const p2 = path[0][path[0].length - 1];
   if (p1[0] === p2[0] && p1[1] === p2[1]) {
     path[0] = path[0].slice(0, path[0].length - 1);
   }
-  var n = path[0].length;
-  var flattengeo = _earcut.default.flatten(path);
-  var positions = [];
-  var indexArray = [];
-  var normals = [];
+  const n = path[0].length;
+  const flattengeo = _earcut.default.flatten(path);
+  const positions = [];
+  const indexArray = [];
+  const normals = [];
   // 设置顶部z值
-  for (var j = 0; j < flattengeo.vertices.length / 3; j++) {
+  for (let j = 0; j < flattengeo.vertices.length / 3; j++) {
     flattengeo.vertices[j * 3 + 2] = 1;
     normals.push(0, 0, 1);
   }
-  positions.push.apply(positions, (0, _toConsumableArray2.default)(flattengeo.vertices));
-  var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
-  indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)(triangles));
-  var _loop = function _loop() {
-    var prePoint = flattengeo.vertices.slice(i * 3, i * 3 + 3);
-    var nextPoint = flattengeo.vertices.slice(i * 3 + 3, i * 3 + 6);
+  positions.push(...flattengeo.vertices);
+  const triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
+  indexArray.push(...triangles);
+  for (let i = 0; i < n; i++) {
+    const prePoint = flattengeo.vertices.slice(i * 3, i * 3 + 3);
+    let nextPoint = flattengeo.vertices.slice(i * 3 + 3, i * 3 + 6);
     if (nextPoint.length === 0) {
       nextPoint = flattengeo.vertices.slice(0, 3);
     }
-    var indexOffset = positions.length / 3;
+    const indexOffset = positions.length / 3;
     positions.push(prePoint[0], prePoint[1], 1, nextPoint[0], nextPoint[1], 1, prePoint[0], prePoint[1], 0, nextPoint[0], nextPoint[1], 0);
-    indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)([1, 2, 0, 3, 2, 1].map(function (v) {
-      return v + indexOffset;
-    })));
-  };
-  for (var i = 0; i < n; i++) {
-    _loop();
+    indexArray.push(...[1, 2, 0, 3, 2, 1].map(v => v + indexOffset));
   }
   return {
-    positions: positions,
+    positions,
     index: indexArray
   };
 }
 function fillPolygon(points) {
-  var flattengeo = _earcut.default.flatten(points);
-  var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
+  const flattengeo = _earcut.default.flatten(points);
+  const triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   return {
     positions: flattengeo.vertices,
     index: triangles

package/lib/polygon/index.d.ts

@@ -0,0 +1,18 @@
+import BaseLayer from '../core/BaseLayer';
+import type { IPolygonLayerStyleOptions } from '../core/interface';
+import type { PolygonModelType } from './models/';
+export default class PolygonLayer extends BaseLayer<IPolygonLayerStyleOptions> {
+    type: string;
+    enableShaderEncodeStyles: string[];
+    defaultSourceConfig: {
+        data: [];
+        options: {
+            parser: {
+                type: 'geojson';
+            };
+        };
+    };
+    buildModels(): Promise<void>;
+    getModelType(): PolygonModelType;
+    protected getPointModelType(): PolygonModelType;
+}

package/lib/polygon/index.js

@@ -5,112 +5,76 @@ 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 _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 PolygonLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
-  (0, _inherits2.default)(PolygonLayer, _BaseLayer);
-  var _super = _createSuper(PolygonLayer);
-  function PolygonLayer() {
-    var _this;
-    (0, _classCallCheck2.default)(this, PolygonLayer);
-    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", 'PolygonLayer');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableShaderEncodeStyles", ['opacity', 'extrusionBase',
+class PolygonLayer extends _BaseLayer.default {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "type", 'PolygonLayer');
+    (0, _defineProperty2.default)(this, "enableShaderEncodeStyles", ['opacity', 'extrusionBase',
     // shape 为文本时
     'rotation', 'offsets', 'stroke']);
-    return _this;
   }
-  (0, _createClass2.default)(PolygonLayer, [{
-    key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var shape;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              shape = this.getModelType();
-              this.layerModel = new _models.default[shape](this);
-              _context.next = 4;
-              return this.initLayerModels();
-            case 4:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
+  buildModels() {
+    var _this = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      const shape = _this.getModelType();
+      _this.layerModel = new _models.default[shape](_this);
+      yield _this.initLayerModels();
+    })();
+  }
+  getModelType() {
+    var _shapeAttribute$scale;
+    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
+    const shape = shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
+    if (shape === 'fill' || !shape) {
+      return 'fill';
+    } else if (shape === 'extrude') {
+      return 'extrude';
+    } else if (shape === 'extrusion') {
+      return 'extrusion';
+    } else if (shape === 'water') {
+      return 'water';
+    } else if (shape === 'ocean') {
+      return 'ocean';
+    } else if (shape === 'line') {
+      return 'line';
+    } else {
+      return this.getPointModelType();
+    }
+  }
+  getPointModelType() {
+    // pointlayer
+    //  2D、 3d、 shape、image、text、normal、
+    const layerData = this.getEncodedData();
+    const {
+      shape2d,
+      shape3d
+    } = this.getLayerConfig();
+    const iconMap = this.iconService.getIconMap();
+    const item = layerData.find(fe => {
+      return fe.hasOwnProperty('shape');
+    });
+    if (!item) {
+      return 'fill';
+    } else {
+      const shape = item.shape;
+      if (shape === 'dot') {
+        return 'point_normal';
       }
-      return buildModels;
-    }()
-  }, {
-    key: "getModelType",
-    value: function getModelType() {
-      var _shapeAttribute$scale;
-      var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
-      if (shape === 'fill' || !shape) {
-        return 'fill';
-      } else if (shape === 'extrude') {
-        return 'extrude';
-      } else if (shape === 'extrusion') {
-        return 'extrusion';
-      } else if (shape === 'water') {
-        return 'water';
-      } else if (shape === 'ocean') {
-        return 'ocean';
-      } else if (shape === 'line') {
-        return 'line';
-      } else {
-        return this.getPointModelType();
+      if ((shape2d === null || shape2d === void 0 ? void 0 : shape2d.indexOf(shape)) !== -1) {
+        return 'point_fill';
       }
-    }
-  }, {
-    key: "getPointModelType",
-    value: function getPointModelType() {
-      // pointlayer
-      //  2D、 3d、 shape、image、text、normal、
-      var layerData = this.getEncodedData();
-      var _this$getLayerConfig = this.getLayerConfig(),
-        shape2d = _this$getLayerConfig.shape2d,
-        shape3d = _this$getLayerConfig.shape3d;
-      var iconMap = this.iconService.getIconMap();
-      var item = layerData.find(function (fe) {
-        return fe.hasOwnProperty('shape');
-      });
-      if (!item) {
-        return 'fill';
-      } else {
-        var shape = item.shape;
-        if (shape === 'dot') {
-          return 'point_normal';
-        }
-        if ((shape2d === null || shape2d === void 0 ? void 0 : shape2d.indexOf(shape)) !== -1) {
-          return 'point_fill';
-        }
-        if ((shape3d === null || shape3d === void 0 ? void 0 : shape3d.indexOf(shape)) !== -1) {
-          return 'point_extrude';
-        }
-        if (iconMap.hasOwnProperty(shape)) {
-          return 'point_image';
-        }
-        return 'text';
+      if ((shape3d === null || shape3d === void 0 ? void 0 : shape3d.indexOf(shape)) !== -1) {
+        return 'point_extrude';
+      }
+      if (iconMap.hasOwnProperty(shape)) {
+        return 'point_image';
       }
+      return 'text';
     }
-  }]);
-  return PolygonLayer;
-}(_BaseLayer2.default);
+  }
+}
+exports.default = PolygonLayer;

package/lib/polygon/models/extrude.d.ts

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