@antv/l7-layers 2.21.0 → 2.21.2

package/lib/mask/index.js

@@ -5,60 +5,25 @@ 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 MaskLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
-  (0, _inherits2.default)(MaskLayer, _BaseLayer);
-  var _super = _createSuper(MaskLayer);
-  function MaskLayer() {
-    var _this;
-    (0, _classCallCheck2.default)(this, MaskLayer);
-    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", 'MaskLayer');
-    return _this;
+class MaskLayer extends _BaseLayer.default {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "type", 'MaskLayer');
   }
-  (0, _createClass2.default)(MaskLayer, [{
-    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);
-      }
-      return buildModels;
-    }()
-  }, {
-    key: "getModelType",
-    value: function getModelType() {
-      return 'fill';
-    }
-  }]);
-  return MaskLayer;
-}(_BaseLayer2.default);
+  buildModels() {
+    var _this = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      const shape = _this.getModelType();
+      _this.layerModel = new _models.default[shape](_this);
+      yield _this.initLayerModels();
+    })();
+  }
+  getModelType() {
+    return 'fill';
+  }
+}
+exports.default = MaskLayer;

package/lib/mask/models/fill.d.ts

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

package/lib/mask/models/fill.js

@@ -5,119 +5,64 @@ 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 _l7Utils = require("@antv/l7-utils");
-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 '../../shader/minify_frag.glsl' */
-var mask_frag = "layout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\nout vec4 outputColor;\n\nvoid main() {\n  outputColor = u_color;\n  outputColor.a *= u_opacity;\n}\n";
+const mask_frag = "layout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\nout vec4 outputColor;\n\nvoid main() {\n  outputColor = u_color;\n  outputColor.a *= u_opacity;\n}\n";
 /* babel-plugin-inline-import '../shaders/mask_vert.glsl' */
-var mask_vert = "layout(location = 0) in vec3 a_Position;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\n#pragma include \"projection\"\n\nvoid main() {\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
-var MaskModel = exports.default = /*#__PURE__*/function (_BaseModel) {
-  (0, _inherits2.default)(MaskModel, _BaseModel);
-  var _super = _createSuper(MaskModel);
-  function MaskModel() {
-    (0, _classCallCheck2.default)(this, MaskModel);
-    return _super.apply(this, arguments);
+const mask_vert = "layout(location = 0) in vec3 a_Position;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\n#pragma include \"projection\"\n\nvoid main() {\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
+class MaskModel 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)(MaskModel, [{
-    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(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-        _ref$color = _ref.color,
-        color = _ref$color === void 0 ? '#000' : _ref$color;
-      var commonOptions = {
-        u_color: (0, _l7Utils.rgb2arr)(color),
-        u_opacity: opacity || 1
-      };
-      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: 'mask',
-                vertexShader: mask_vert,
-                fragmentShader: mask_frag,
-                triangulation: _triangulation.polygonTriangulation,
-                depth: {
-                  enable: false
-                },
-                pick: false
-              });
-            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: "clearModels",
-    value: function clearModels() {
-      var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-      if (refresh) {
-        this.layerService.clear();
-      }
-    }
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      return '';
+  getCommonUniformsInfo() {
+    const {
+      opacity = 1,
+      color = '#000'
+    } = this.layer.getLayerConfig();
+    const commonOptions = {
+      u_color: (0, _l7Utils.rgb2arr)(color),
+      u_opacity: opacity || 1
+    };
+    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: 'mask',
+        vertexShader: mask_vert,
+        fragmentShader: mask_frag,
+        triangulation: _triangulation.polygonTriangulation,
+        depth: {
+          enable: false
+        },
+        pick: false
+      });
+      return [model];
+    })();
+  }
+  clearModels(refresh = true) {
+    if (refresh) {
+      this.layerService.clear();
     }
-  }]);
-  return MaskModel;
-}(_BaseModel2.default);
+  }
+  registerBuiltinAttributes() {
+    return '';
+  }
+}
+exports.default = MaskModel;

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

@@ -0,0 +1,5 @@
+export type MaskModelType = 'fill';
+declare const MaskModels: {
+    [key in MaskModelType]: any;
+};
+export default MaskModels;

package/lib/mask/models/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _fill = _interopRequireDefault(require("./fill"));
-var MaskModels = {
+const MaskModels = {
   fill: _fill.default
 };
 var _default = exports.default = MaskModels;

package/lib/plugins/DataMappingPlugin.d.ts

@@ -0,0 +1,13 @@
+import type { ILayer, ILayerPlugin, L7Container } from '@antv/l7-core';
+export default class DataMappingPlugin implements ILayerPlugin {
+    private mapService;
+    private fontService;
+    apply(layer: ILayer, { styleAttributeService, mapService, fontService }: L7Container): void;
+    private generateMaping;
+    private mapping;
+    private adjustData2Amap2Coordinates;
+    private adjustData2SimpleCoordinates;
+    private unProjectCoordinates;
+    private applyAttributeMapping;
+    private getArrowPoints;
+}