@antv/l7-layers 2.21.1 → 2.21.3

package/es/point/shape/extrude.js

@@ -1,4 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import earcut from 'earcut';
 /**
  * 拉伸多边形顶点，返回拉伸后的顶点信息
@@ -6,47 +5,42 @@ import earcut from 'earcut';
  * @param extrude 是否拉伸
  */
 export default 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.flatten(path);
-  var positions = [];
-  var indexArray = [];
-  var normals = [];
+  const n = path[0].length;
+  const flattengeo = earcut.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, _toConsumableArray(flattengeo.vertices));
-  var triangles = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
-  indexArray.push.apply(indexArray, _toConsumableArray(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 = earcut(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, _toConsumableArray([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
   };
 }
 export function fillPolygon(points) {
-  var flattengeo = earcut.flatten(points);
-  var triangles = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
+  const flattengeo = earcut.flatten(points);
+  const triangles = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   return {
     positions: flattengeo.vertices,
     index: triangles

package/es/polygon/index.js

@@ -1,110 +1,72 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
-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 _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 PolygonModels from "./models/";
-var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
-  _inherits(PolygonLayer, _BaseLayer);
-  var _super = _createSuper(PolygonLayer);
-  function PolygonLayer() {
-    var _this;
-    _classCallCheck(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));
-    _defineProperty(_assertThisInitialized(_this), "type", 'PolygonLayer');
-    _defineProperty(_assertThisInitialized(_this), "enableShaderEncodeStyles", ['opacity', 'extrusionBase',
+export default class PolygonLayer extends BaseLayer {
+  constructor(...args) {
+    super(...args);
+    _defineProperty(this, "type", 'PolygonLayer');
+    _defineProperty(this, "enableShaderEncodeStyles", ['opacity', 'extrusionBase',
     // shape 为文本时
     'rotation', 'offsets', 'stroke']);
-    return _this;
   }
-  _createClass(PolygonLayer, [{
-    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 PolygonModels[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 _asyncToGenerator(function* () {
+      const shape = _this.getModelType();
+      _this.layerModel = new PolygonModels[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;
-}(BaseLayer);
-export { PolygonLayer as default };
+  }
+}