@antv/l7-layers 2.10.6 → 2.10.9

package/es/point/models/tileText.js

@@ -95,48 +95,6 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
 
     _defineProperty(_assertThisInitialized(_this), "preTextStyle", {});
 
-    _defineProperty(_assertThisInitialized(_this), "buildModels", /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(callbackModel) {
-        var _this$layer$getLayerC, usage;
-
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _this.mapping();
-
-                _this$layer$getLayerC = _this.layer.getLayerConfig(), usage = _this$layer$getLayerC.usage;
-
-                _this.layer.buildLayerModel({
-                  moduleName: 'pointTileText_' + usage,
-                  vertexShader: usage === 'basemap' ? text_map_vert : text_vert,
-                  fragmentShader: usage === 'basemap' ? text_map_frag : text_frag,
-                  triangulation: TextTriangulation.bind(_assertThisInitialized(_this)),
-                  depth: {
-                    enable: false
-                  },
-                  blend: _this.getBlend(),
-                  pick: usage !== 'basemap'
-                }).then(function (model) {
-                  callbackModel([model]);
-                }).catch(function (err) {
-                  console.warn(err);
-                  callbackModel([]);
-                });
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }));
-
-      return function (_x) {
-        return _ref.apply(this, arguments);
-      };
-    }());
-
     _defineProperty(_assertThisInitialized(_this), "mapping", function () {
       _this.initGlyph();
 
@@ -153,26 +111,26 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
   _createClass(TextModel, [{
     key: "getUninforms",
     value: function getUninforms() {
-      var _ref2 = this.layer.getLayerConfig(),
-          _ref2$opacity = _ref2.opacity,
-          opacity = _ref2$opacity === void 0 ? 1.0 : _ref2$opacity,
-          _ref2$stroke = _ref2.stroke,
-          stroke = _ref2$stroke === void 0 ? '#fff' : _ref2$stroke,
-          _ref2$strokeWidth = _ref2.strokeWidth,
-          strokeWidth = _ref2$strokeWidth === void 0 ? 0 : _ref2$strokeWidth,
-          _ref2$textAnchor = _ref2.textAnchor,
-          textAnchor = _ref2$textAnchor === void 0 ? 'center' : _ref2$textAnchor,
-          _ref2$textAllowOverla = _ref2.textAllowOverlap,
-          textAllowOverlap = _ref2$textAllowOverla === void 0 ? false : _ref2$textAllowOverla,
-          _ref2$halo = _ref2.halo,
-          halo = _ref2$halo === void 0 ? 0.5 : _ref2$halo,
-          _ref2$gamma = _ref2.gamma,
-          gamma = _ref2$gamma === void 0 ? 2.0 : _ref2$gamma,
-          usage = _ref2.usage,
-          _ref2$color = _ref2.color,
-          color = _ref2$color === void 0 ? '#fff' : _ref2$color,
-          _ref2$size = _ref2.size,
-          size = _ref2$size === void 0 ? 1 : _ref2$size;
+      var _ref = this.layer.getLayerConfig(),
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1.0 : _ref$opacity,
+          _ref$stroke = _ref.stroke,
+          stroke = _ref$stroke === void 0 ? '#fff' : _ref$stroke,
+          _ref$strokeWidth = _ref.strokeWidth,
+          strokeWidth = _ref$strokeWidth === void 0 ? 0 : _ref$strokeWidth,
+          _ref$textAnchor = _ref.textAnchor,
+          textAnchor = _ref$textAnchor === void 0 ? 'center' : _ref$textAnchor,
+          _ref$textAllowOverlap = _ref.textAllowOverlap,
+          textAllowOverlap = _ref$textAllowOverlap === void 0 ? false : _ref$textAllowOverlap,
+          _ref$halo = _ref.halo,
+          halo = _ref$halo === void 0 ? 0.5 : _ref$halo,
+          _ref$gamma = _ref.gamma,
+          gamma = _ref$gamma === void 0 ? 2.0 : _ref$gamma,
+          usage = _ref.usage,
+          _ref$color = _ref.color,
+          color = _ref$color === void 0 ? '#fff' : _ref$color,
+          _ref$size = _ref.size,
+          size = _ref$size === void 0 ? 1 : _ref$size;
 
       var _this$fontService = this.fontService,
           canvas = _this$fontService.canvas,
@@ -201,21 +159,83 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.extent = this.textExtent();
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _ref2, _ref2$textAnchor, textAnchor, _ref2$textAllowOverla, textAllowOverlap;
 
-      var _ref3 = this.layer.getLayerConfig(),
-          _ref3$textAnchor = _ref3.textAnchor,
-          textAnchor = _ref3$textAnchor === void 0 ? 'center' : _ref3$textAnchor,
-          _ref3$textAllowOverla = _ref3.textAllowOverlap,
-          textAllowOverlap = _ref3$textAllowOverla === void 0 ? true : _ref3$textAllowOverla;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                this.extent = this.textExtent();
+                _ref2 = this.layer.getLayerConfig(), _ref2$textAnchor = _ref2.textAnchor, textAnchor = _ref2$textAnchor === void 0 ? 'center' : _ref2$textAnchor, _ref2$textAllowOverla = _ref2.textAllowOverlap, textAllowOverlap = _ref2$textAllowOverla === void 0 ? true : _ref2$textAllowOverla;
+                this.preTextStyle = {
+                  textAnchor: textAnchor,
+                  textAllowOverlap: textAllowOverlap
+                };
+                _context.next = 5;
+                return this.buildModels();
+
+              case 5:
+                return _context.abrupt("return", _context.sent);
+
+              case 6:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
 
-      this.preTextStyle = {
-        textAnchor: textAnchor,
-        textAllowOverlap: textAllowOverlap
-      };
-      this.buildModels(callbackModel);
-    }
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
+  }, {
+    key: "buildModels",
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _this$layer$getLayerC, usage, model;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                this.mapping();
+                _this$layer$getLayerC = this.layer.getLayerConfig(), usage = _this$layer$getLayerC.usage;
+                _context2.next = 4;
+                return this.layer.buildLayerModel({
+                  moduleName: 'pointTileText_' + usage,
+                  vertexShader: usage === 'basemap' ? text_map_vert : text_vert,
+                  fragmentShader: usage === 'basemap' ? text_map_frag : text_frag,
+                  triangulation: TextTriangulation.bind(this),
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend(),
+                  pick: usage !== 'basemap'
+                });
+
+              case 4:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 6:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -297,11 +317,11 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initTextFont",
     value: function initTextFont() {
-      var _ref4 = this.layer.getLayerConfig(),
-          _ref4$fontWeight = _ref4.fontWeight,
-          fontWeight = _ref4$fontWeight === void 0 ? '400' : _ref4$fontWeight,
-          _ref4$fontFamily = _ref4.fontFamily,
-          fontFamily = _ref4$fontFamily === void 0 ? 'sans-serif' : _ref4$fontFamily;
+      var _ref3 = this.layer.getLayerConfig(),
+          _ref3$fontWeight = _ref3.fontWeight,
+          fontWeight = _ref3$fontWeight === void 0 ? '400' : _ref3$fontWeight,
+          _ref3$fontFamily = _ref3.fontFamily,
+          fontFamily = _ref3$fontFamily === void 0 ? 'sans-serif' : _ref3$fontFamily;
 
       var data = this.layer.getEncodedData();
       var characterSet = [];
@@ -346,11 +366,11 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
 
       var mapping = this.fontService.mapping;
 
-      var _ref5 = this.layer.getLayerConfig(),
-          _ref5$spacing = _ref5.spacing,
-          spacing = _ref5$spacing === void 0 ? 2 : _ref5$spacing,
-          _ref5$textAnchor = _ref5.textAnchor,
-          textAnchor = _ref5$textAnchor === void 0 ? 'center' : _ref5$textAnchor;
+      var _ref4 = this.layer.getLayerConfig(),
+          _ref4$spacing = _ref4.spacing,
+          spacing = _ref4$spacing === void 0 ? 2 : _ref4$spacing,
+          _ref4$textAnchor = _ref4.textAnchor,
+          textAnchor = _ref4$textAnchor === void 0 ? 'center' : _ref4$textAnchor;
 
       var data = this.layer.getEncodedData();
       this.glyphInfo = data.map(function (feature) {
@@ -386,11 +406,11 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     value: function filterGlyphs() {
       var _this3 = this;
 
-      var _ref6 = this.layer.getLayerConfig(),
-          _ref6$padding = _ref6.padding,
-          padding = _ref6$padding === void 0 ? [4, 4] : _ref6$padding,
-          _ref6$textAllowOverla = _ref6.textAllowOverlap,
-          textAllowOverlap = _ref6$textAllowOverla === void 0 ? false : _ref6$textAllowOverla;
+      var _ref5 = this.layer.getLayerConfig(),
+          _ref5$padding = _ref5.padding,
+          padding = _ref5$padding === void 0 ? [4, 4] : _ref5$padding,
+          _ref5$textAllowOverla = _ref5.textAllowOverlap,
+          textAllowOverlap = _ref5$textAllowOverla === void 0 ? false : _ref5$textAllowOverla;
 
       if (textAllowOverlap) {
         // 如果允许文本覆盖
@@ -475,32 +495,47 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "reBuildModel",
-    value: function reBuildModel() {
-      var _this4 = this;
-
-      var _this$layer$getLayerC3 = this.layer.getLayerConfig(),
-          usage = _this$layer$getLayerC3.usage;
-
-      this.filterGlyphs();
-      this.layer.buildLayerModel({
-        moduleName: 'pointTileText_' + usage,
-        vertexShader: usage === 'basemap' ? text_map_vert : text_vert,
-        fragmentShader: usage === 'basemap' ? text_map_frag : text_frag,
-        triangulation: TextTriangulation.bind(this),
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend(),
-        pick: usage !== 'basemap'
-      }).then(function (model) {
-        _this4.layer.models = [model];
-
-        _this4.layerService.throttleRenderLayers();
-      }).catch(function (err) {
-        console.warn(err);
-        _this4.layer.models = [];
-      });
-    }
+    value: function () {
+      var _reBuildModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        var _this$layer$getLayerC3, usage, model;
+
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _this$layer$getLayerC3 = this.layer.getLayerConfig(), usage = _this$layer$getLayerC3.usage;
+                this.filterGlyphs();
+                _context3.next = 4;
+                return this.layer.buildLayerModel({
+                  moduleName: 'pointTileText_' + usage,
+                  vertexShader: usage === 'basemap' ? text_map_vert : text_vert,
+                  fragmentShader: usage === 'basemap' ? text_map_frag : text_frag,
+                  triangulation: TextTriangulation.bind(this),
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend(),
+                  pick: usage !== 'basemap'
+                });
+
+              case 4:
+                model = _context3.sent;
+                return _context3.abrupt("return", [model]);
+
+              case 6:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function reBuildModel() {
+        return _reBuildModel.apply(this, arguments);
+      }
+
+      return reBuildModel;
+    }()
   }]);
 
   return TextModel;

package/es/polygon/index.d.ts

@@ -11,8 +11,7 @@ export default class PolygonLayer extends BaseLayer<IPolygonLayerStyleOptions> {
             };
         };
     };
-    buildModels(): void;
-    rebuildModels(): void;
-    protected getModelType(): PolygonModelType;
+    buildModels(): Promise<void>;
+    getModelType(): PolygonModelType;
     protected getPointModelType(): PolygonModelType;
 }

package/es/polygon/index.js

@@ -1,3 +1,4 @@
+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";
@@ -5,13 +6,13 @@ 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 { isVectorTile } from "../tile/utils";
 import PolygonModels from "./models/";
 
 var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
@@ -37,35 +38,37 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(PolygonLayer, [{
     key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var shape = this.getModelType();
-      this.layerModel = new PolygonModels[shape](this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
+    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);
+      }
 
-      this.layerModel.buildModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
+      return buildModels;
+    }()
   }, {
     key: "getModelType",
     value: function getModelType() {
       var _shapeAttribute$scale;
 
-      var parserType = this.layerSource.getParserType();
-
-      if (isVectorTile(parserType)) {
-        return 'vectorpolygon';
-      }
-
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
       var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
 

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

@@ -15,8 +15,8 @@ export default class ExtrudeModel extends BaseModel {
         u_targetColor: number[];
         u_texture: ITexture2D;
     };
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     getShaders(): {
         frag: string;
         vert: string;

package/es/polygon/models/extrude.js

@@ -1,9 +1,11 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+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 _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
+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); }; }
 
@@ -124,37 +126,72 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.loadTexture();
-      this.buildModels(callbackModel);
-    }
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                this.loadTexture();
+                _context.next = 3;
+                return this.buildModels();
+
+              case 3:
+                return _context.abrupt("return", _context.sent);
+
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      var _ref2 = this.layer.getLayerConfig(),
-          _ref2$mask = _ref2.mask,
-          mask = _ref2$mask === void 0 ? false : _ref2$mask,
-          _ref2$maskInside = _ref2.maskInside,
-          maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-
-      var _this$getShaders = this.getShaders(),
-          frag = _this$getShaders.frag,
-          vert = _this$getShaders.vert,
-          type = _this$getShaders.type;
-
-      this.layer.buildLayerModel({
-        moduleName: type,
-        vertexShader: vert,
-        fragmentShader: frag,
-        triangulation: PolygonExtrudeTriangulation,
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, _this$getShaders, frag, vert, type, model;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
+                _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
+                _context2.next = 4;
+                return this.layer.buildLayerModel({
+                  moduleName: type,
+                  vertexShader: vert,
+                  fragmentShader: frag,
+                  triangulation: PolygonExtrudeTriangulation,
+                  stencil: getMask(mask, maskInside)
+                });
+
+              case 4:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 6:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "getShaders",
     value: function getShaders() {

package/es/polygon/models/fill.d.ts

@@ -9,8 +9,8 @@ export default class FillModel extends BaseModel {
         u_opacitylinear: number;
         u_dir: number;
     };
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
     private getModelParams;