@antv/l7-layers 2.10.2 → 2.10.4

package/es/wind/index.js

@@ -1,12 +1,10 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+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";
 
 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); }; }
 
@@ -38,32 +36,24 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(WindLayer, [{
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var modelType;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                modelType = this.getModelType();
-                this.layerModel = new WindModels[modelType](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
+    value: function buildModels() {
+      var _this2 = this;
+
+      var modelType = this.getModelType();
+      this.layerModel = new WindModels[modelType](this);
+      this.layerModel.initModels(function (models) {
+        _this2.dispatchModelLoad(models);
+      });
+    }
+  }, {
+    key: "rebuildModels",
+    value: function rebuildModels() {
+      var _this3 = this;
 
-      return buildModels;
-    }()
+      this.layerModel.buildModels(function (models) {
+        _this3.dispatchModelLoad(models);
+      });
+    }
   }, {
     key: "renderModels",
     value: function renderModels() {

package/es/wind/models/wind.d.ts

@@ -10,12 +10,12 @@ export default class WindModel extends BaseModel {
     private cacheZoom;
     render(): void;
     getUninforms(): IModelUniform;
-    initModels(): Promise<IModel[]>;
+    initModels(callbackModel: (models: IModel[]) => void): void;
     getWindSize(): {
         imageWidth: number;
         imageHeight: number;
     };
-    buildModels(): Promise<IModel[]>;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
     private getZoomScale;

package/es/wind/models/wind.js

@@ -1,12 +1,10 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+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";
 
 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); }; }
 
@@ -75,99 +73,103 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _source$data,
-            _source$data2,
-            _source$data2$images,
-            _this3 = this;
-
-        var _ref, _ref$uMin, uMin, _ref$uMax, uMax, _ref$vMin, vMin, _ref$vMax, vMax, _ref$fadeOpacity, fadeOpacity, _ref$speedFactor, speedFactor, _ref$dropRate, dropRate, _ref$dropRateBump, dropRateBump, _ref$rampColors, rampColors, _ref$sizeScale, sizeScale, _ref$mask, mask, _ref$maskInside, maskInside, createTexture2D, source, glContext, model;
-
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _ref = this.layer.getLayerConfig(), _ref$uMin = _ref.uMin, uMin = _ref$uMin === void 0 ? -21.32 : _ref$uMin, _ref$uMax = _ref.uMax, uMax = _ref$uMax === void 0 ? 26.8 : _ref$uMax, _ref$vMin = _ref.vMin, vMin = _ref$vMin === void 0 ? -21.57 : _ref$vMin, _ref$vMax = _ref.vMax, vMax = _ref$vMax === void 0 ? 21.42 : _ref$vMax, _ref$fadeOpacity = _ref.fadeOpacity, fadeOpacity = _ref$fadeOpacity === void 0 ? 0.996 : _ref$fadeOpacity, _ref$speedFactor = _ref.speedFactor, speedFactor = _ref$speedFactor === void 0 ? 0.25 : _ref$speedFactor, _ref$dropRate = _ref.dropRate, dropRate = _ref$dropRate === void 0 ? 0.003 : _ref$dropRate, _ref$dropRateBump = _ref.dropRateBump, dropRateBump = _ref$dropRateBump === void 0 ? 0.01 : _ref$dropRateBump, _ref$rampColors = _ref.rampColors, rampColors = _ref$rampColors === void 0 ? defaultRampColors : _ref$rampColors, _ref$sizeScale = _ref.sizeScale, sizeScale = _ref$sizeScale === void 0 ? 0.5 : _ref$sizeScale, _ref$mask = _ref.mask, mask = _ref$mask === void 0 ? false : _ref$mask, _ref$maskInside = _ref.maskInside, maskInside = _ref$maskInside === void 0 ? true : _ref$maskInside;
-                createTexture2D = this.rendererService.createTexture2D;
-                source = this.layer.getSource();
-                this.texture = createTexture2D({
-                  height: 0,
-                  width: 0
-                });
-                this.cacheZoom = Math.floor(this.mapService.getZoom());
-                glContext = this.rendererService.getGLContext();
-                this.imageCoords = (_source$data = source.data) === null || _source$data === void 0 ? void 0 : _source$data.dataArray[0].coordinates;
-                (_source$data2 = source.data) === null || _source$data2 === void 0 ? void 0 : (_source$data2$images = _source$data2.images) === null || _source$data2$images === void 0 ? void 0 : _source$data2$images.then(function (imageData) {
-                  var _this3$texture;
-
-                  _this3.sizeScale = sizeScale * _this3.getZoomScale();
-
-                  var _this3$getWindSize = _this3.getWindSize(),
-                      imageWidth = _this3$getWindSize.imageWidth,
-                      imageHeight = _this3$getWindSize.imageHeight;
-
-                  var options = {
-                    glContext: glContext,
-                    imageWidth: imageWidth,
-                    imageHeight: imageHeight,
-                    fadeOpacity: fadeOpacity,
-                    speedFactor: speedFactor,
-                    dropRate: dropRate,
-                    dropRateBump: dropRateBump,
-                    rampColors: rampColors
-                  };
-                  _this3.wind = new Wind(options); // imageData[0] 风场图
-
-                  _this3.wind.setWind({
-                    uMin: uMin,
-                    uMax: uMax,
-                    vMin: vMin,
-                    vMax: vMax,
-                    image: imageData[0]
-                  });
-
-                  (_this3$texture = _this3.texture) === null || _this3$texture === void 0 ? void 0 : _this3$texture.destroy();
-                  _this3.texture = createTexture2D({
-                    width: imageWidth,
-                    height: imageHeight
-                  });
-
-                  _this3.layerService.reRender();
-                });
-                _context.next = 10;
-                return this.layer.buildLayerModel({
-                  moduleName: 'wind',
-                  vertexShader: WindVert,
-                  fragmentShader: WindFrag,
-                  triangulation: RasterImageTriangulation,
-                  primitive: gl.TRIANGLES,
-                  depth: {
-                    enable: false
-                  },
-                  stencil: getMask(mask, maskInside),
-                  blend: this.getBlend()
-                });
-
-              case 10:
-                model = _context.sent;
-                this.colorModel = model;
-                return _context.abrupt("return", [model]);
-
-              case 13:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
+    value: function initModels(callbackModel) {
+      var _source$data,
+          _source$data2,
+          _source$data2$images,
+          _this3 = this;
+
+      var _ref = this.layer.getLayerConfig(),
+          _ref$uMin = _ref.uMin,
+          uMin = _ref$uMin === void 0 ? -21.32 : _ref$uMin,
+          _ref$uMax = _ref.uMax,
+          uMax = _ref$uMax === void 0 ? 26.8 : _ref$uMax,
+          _ref$vMin = _ref.vMin,
+          vMin = _ref$vMin === void 0 ? -21.57 : _ref$vMin,
+          _ref$vMax = _ref.vMax,
+          vMax = _ref$vMax === void 0 ? 21.42 : _ref$vMax,
+          _ref$fadeOpacity = _ref.fadeOpacity,
+          fadeOpacity = _ref$fadeOpacity === void 0 ? 0.996 : _ref$fadeOpacity,
+          _ref$speedFactor = _ref.speedFactor,
+          speedFactor = _ref$speedFactor === void 0 ? 0.25 : _ref$speedFactor,
+          _ref$dropRate = _ref.dropRate,
+          dropRate = _ref$dropRate === void 0 ? 0.003 : _ref$dropRate,
+          _ref$dropRateBump = _ref.dropRateBump,
+          dropRateBump = _ref$dropRateBump === void 0 ? 0.01 : _ref$dropRateBump,
+          _ref$rampColors = _ref.rampColors,
+          rampColors = _ref$rampColors === void 0 ? defaultRampColors : _ref$rampColors,
+          _ref$sizeScale = _ref.sizeScale,
+          sizeScale = _ref$sizeScale === void 0 ? 0.5 : _ref$sizeScale,
+          _ref$mask = _ref.mask,
+          mask = _ref$mask === void 0 ? false : _ref$mask,
+          _ref$maskInside = _ref.maskInside,
+          maskInside = _ref$maskInside === void 0 ? true : _ref$maskInside;
+
+      var createTexture2D = this.rendererService.createTexture2D;
+      var source = this.layer.getSource();
+      this.texture = createTexture2D({
+        height: 0,
+        width: 0
+      });
+      this.cacheZoom = Math.floor(this.mapService.getZoom());
+      var glContext = this.rendererService.getGLContext();
+      this.imageCoords = (_source$data = source.data) === null || _source$data === void 0 ? void 0 : _source$data.dataArray[0].coordinates;
+      (_source$data2 = source.data) === null || _source$data2 === void 0 ? void 0 : (_source$data2$images = _source$data2.images) === null || _source$data2$images === void 0 ? void 0 : _source$data2$images.then(function (imageData) {
+        var _this3$texture;
+
+        _this3.sizeScale = sizeScale * _this3.getZoomScale();
+
+        var _this3$getWindSize = _this3.getWindSize(),
+            imageWidth = _this3$getWindSize.imageWidth,
+            imageHeight = _this3$getWindSize.imageHeight;
+
+        var options = {
+          glContext: glContext,
+          imageWidth: imageWidth,
+          imageHeight: imageHeight,
+          fadeOpacity: fadeOpacity,
+          speedFactor: speedFactor,
+          dropRate: dropRate,
+          dropRateBump: dropRateBump,
+          rampColors: rampColors
+        };
+        _this3.wind = new Wind(options); // imageData[0] 风场图
+
+        _this3.wind.setWind({
+          uMin: uMin,
+          uMax: uMax,
+          vMin: vMin,
+          vMax: vMax,
+          image: imageData[0]
+        });
 
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
+        (_this3$texture = _this3.texture) === null || _this3$texture === void 0 ? void 0 : _this3$texture.destroy();
+        _this3.texture = createTexture2D({
+          width: imageWidth,
+          height: imageHeight
+        });
 
-      return initModels;
-    }()
+        _this3.layerService.reRender();
+      });
+      this.layer.buildLayerModel({
+        moduleName: 'wind',
+        vertexShader: WindVert,
+        fragmentShader: WindFrag,
+        triangulation: RasterImageTriangulation,
+        primitive: gl.TRIANGLES,
+        depth: {
+          enable: false
+        },
+        stencil: getMask(mask, maskInside),
+        blend: this.getBlend()
+      }).then(function (model) {
+        _this3.colorModel = model;
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "getWindSize",
     value: function getWindSize() {
@@ -182,32 +184,9 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return this.initModels();
-
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
+    value: function buildModels(callbackModel) {
+      this.initModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -317,7 +296,12 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
       var _ref3 = this.layer.getLayerConfig(),
           opacity = _ref3.opacity;
 
-      this.layerService.renderMask(this.layer.masks);
+      this.layer.masks.map(function (m) {
+        m.hooks.beforeRenderData.call();
+        m.hooks.beforeRender.call();
+        m.render();
+        m.hooks.afterRender.call();
+      });
       (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 ? void 0 : _this$colorModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,

package/es/wind/models/windRender.js

@@ -1,6 +1,6 @@
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import * as glUtils from "./utils";
 import { drawFrag, drawVert, fullScreenFrag, fullScreenVert, updateFrag, updateVert } from "./windShader";
 

package/lib/Geometry/index.js

@@ -7,10 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 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"));
@@ -67,32 +63,24 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
 
   (0, _createClass2.default)(GeometryLayer, [{
     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 _models.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);
-      }
+    value: function buildModels() {
+      var _this2 = this;
+
+      var modelType = this.getModelType();
+      this.layerModel = new _models.default[modelType](this);
+      this.layerModel.initModels(function (models) {
+        _this2.dispatchModelLoad(models);
+      });
+    }
+  }, {
+    key: "rebuildModels",
+    value: function rebuildModels() {
+      var _this3 = this;
 
-      return buildModels;
-    }()
+      this.layerModel.buildModels(function (models) {
+        _this3.dispatchModelLoad(models);
+      });
+    }
   }, {
     key: "getDefaultConfig",
     value: function getDefaultConfig() {

package/lib/Geometry/models/billboard.js

@@ -7,10 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -86,7 +82,7 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
           raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight;
       /**
        *               rotateFlag
-       * DEFAULT            1
+       * L7MAP            1
        * MAPBOX           1
        * GAODE2.x         -1
        * GAODE1.x         -1
@@ -119,85 +115,47 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, drawCanvas, createTexture2D, model;
-
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _ref3 = this.layer.getLayerConfig(), _ref3$mask = _ref3.mask, mask = _ref3$mask === void 0 ? false : _ref3$mask, _ref3$maskInside = _ref3.maskInside, maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside, drawCanvas = _ref3.drawCanvas;
-                createTexture2D = this.rendererService.createTexture2D;
-                this.texture = createTexture2D({
-                  height: 0,
-                  width: 0
-                });
-
-                if (drawCanvas) {
-                  this.updateTexture(drawCanvas);
-                }
-
-                _context.next = 6;
-                return this.layer.buildLayerModel({
-                  moduleName: 'geometryBillboard',
-                  vertexShader: planeVert,
-                  fragmentShader: planeFrag,
-                  triangulation: this.planeGeometryTriangulation,
-                  primitive: _l7Core.gl.TRIANGLES,
-                  depth: {
-                    enable: true
-                  },
-                  blend: this.getBlend(),
-                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
-                });
-
-              case 6:
-                model = _context.sent;
-                return _context.abrupt("return", [model]);
-
-              case 8:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
+    value: function initModels(callbackModel) {
+      var _ref3 = this.layer.getLayerConfig(),
+          _ref3$mask = _ref3.mask,
+          mask = _ref3$mask === void 0 ? false : _ref3$mask,
+          _ref3$maskInside = _ref3.maskInside,
+          maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside,
+          drawCanvas = _ref3.drawCanvas;
 
-      function initModels() {
-        return _initModels.apply(this, arguments);
+      var createTexture2D = this.rendererService.createTexture2D;
+      this.texture = createTexture2D({
+        height: 0,
+        width: 0
+      });
+
+      if (drawCanvas) {
+        this.updateTexture(drawCanvas);
       }
 
-      return initModels;
-    }()
+      this.layer.buildLayerModel({
+        moduleName: 'geometryBillboard',
+        vertexShader: planeVert,
+        fragmentShader: planeFrag,
+        triangulation: this.planeGeometryTriangulation,
+        primitive: _l7Core.gl.TRIANGLES,
+        depth: {
+          enable: true
+        },
+        blend: this.getBlend(),
+        stencil: (0, _l7Utils.getMask)(mask, maskInside)
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return this.initModels();
-
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
+    value: function buildModels(callbackModel) {
+      this.initModels(callbackModel);
+    }
   }, {
     key: "updateTexture",
     value: function updateTexture(drawCanvas) {