@antv/l7-layers 2.10.1 → 2.10.2

package/lib/wind/index.js

@@ -7,6 +7,10 @@ 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"));
@@ -50,24 +54,32 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
 
   (0, _createClass2.default)(WindLayer, [{
     key: "buildModels",
-    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;
+    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);
+      }
 
-      this.layerModel.buildModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
+      return buildModels;
+    }()
   }, {
     key: "renderModels",
     value: function renderModels() {

package/lib/wind/models/wind.js

@@ -7,6 +7,10 @@ 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"));
@@ -89,103 +93,99 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    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 _windRender.Wind(options); // imageData[0] 风场图
-
-        _this3.wind.setWind({
-          uMin: uMin,
-          uMax: uMax,
-          vMin: vMin,
-          vMax: vMax,
-          image: imageData[0]
-        });
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.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 _regenerator.default.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 _windRender.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: _triangulation.RasterImageTriangulation,
+                  primitive: _l7Core.gl.TRIANGLES,
+                  depth: {
+                    enable: false
+                  },
+                  stencil: (0, _l7Utils.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);
+      }));
 
-        (_this3$texture = _this3.texture) === null || _this3$texture === void 0 ? void 0 : _this3$texture.destroy();
-        _this3.texture = createTexture2D({
-          width: imageWidth,
-          height: imageHeight
-        });
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
 
-        _this3.layerService.reRender();
-      });
-      this.layer.buildLayerModel({
-        moduleName: 'wind',
-        vertexShader: WindVert,
-        fragmentShader: WindFrag,
-        triangulation: _triangulation.RasterImageTriangulation,
-        primitive: _l7Core.gl.TRIANGLES,
-        depth: {
-          enable: false
-        },
-        stencil: (0, _l7Utils.getMask)(mask, maskInside),
-        blend: this.getBlend()
-      }).then(function (model) {
-        _this3.colorModel = model;
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+      return initModels;
+    }()
   }, {
     key: "getWindSize",
     value: function getWindSize() {
@@ -200,9 +200,32 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    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;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -312,12 +335,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
       var _ref3 = this.layer.getLayerConfig(),
           opacity = _ref3.opacity;
 
-      this.layer.masks.map(function (m) {
-        m.hooks.beforeRenderData.call();
-        m.hooks.beforeRender.call();
-        m.render();
-        m.hooks.afterRender.call();
-      });
+      this.layerService.renderMask(this.layer.masks);
       (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 ? void 0 : _this$colorModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,11 +26,11 @@
   "author": "xiaoiver",
   "license": "ISC",
   "dependencies": {
-    "@antv/async-hook": "^2.2.2",
-    "@antv/l7-core": "2.10.1",
-    "@antv/l7-maps": "2.10.1",
-    "@antv/l7-source": "2.10.1",
-    "@antv/l7-utils": "2.10.1",
+    "@antv/async-hook": "^2.2.9",
+    "@antv/l7-core": "2.10.2",
+    "@antv/l7-maps": "2.10.2",
+    "@antv/l7-source": "2.10.2",
+    "@antv/l7-utils": "2.10.2",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "25282411015887cd36c2de1e89a43beb886e1a70",
+  "gitHead": "2182dc4ba3ea9e59e964ea853eff2733e5861357",
   "publishConfig": {
     "access": "public"
   }

package/es/tile/interaction/TilePickService.d.ts

@@ -1,16 +0,0 @@
-import { ILayer, IPickingService, IRendererService, IInteractionTarget, ITileRenderService } from '@antv/l7-core';
-import { EventEmitter } from 'eventemitter3';
-export declare class TilePickService extends EventEmitter {
-    isLastPicked: boolean;
-    private rendererService;
-    private pickingService;
-    private children;
-    private parent;
-    private tileRenderService;
-    constructor(parent: ILayer, rendererService: IRendererService, pickingService: IPickingService, children: ILayer[], tileRenderService: ITileRenderService);
-    pick(layers: ILayer[], target: IInteractionTarget): boolean;
-    clearPick(): void;
-    beforeHighlight(pickedColors: any): void;
-    beforeSelect(pickedColors: any): void;
-    destroy(): void;
-}

package/es/tile/interaction/TilePickService.js

@@ -1,129 +0,0 @@
-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";
-
-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 { EventEmitter } from 'eventemitter3';
-export var TilePickService = /*#__PURE__*/function (_EventEmitter) {
-  _inherits(TilePickService, _EventEmitter);
-
-  var _super = _createSuper(TilePickService);
-
-  function TilePickService(parent, rendererService, pickingService, children, tileRenderService) {
-    var _this;
-
-    _classCallCheck(this, TilePickService);
-
-    _this = _super.call(this);
-
-    _defineProperty(_assertThisInitialized(_this), "isLastPicked", false);
-
-    _this.parent = parent;
-    _this.rendererService = rendererService;
-    _this.pickingService = pickingService;
-    _this.children = children;
-    _this.tileRenderService = tileRenderService;
-    return _this;
-  }
-
-  _createClass(TilePickService, [{
-    key: "pick",
-    value: function pick(layers, target) {
-      var _this2 = this;
-
-      // Tip: 在进行拾取渲染的时候也需要先渲染一遍父组件然后再渲染子组件
-      //  如需要在 栅格瓦片存在 Mask 的时候发生的拾取，那么就需要先渲染父组件（渲染父组件的帧缓冲）
-      this.tileRenderService.renderMask(this.parent);
-      var isPicked = layers.filter(function (layer) {
-        return _this2.parent.needPick(target.type) && layer.inited && layer.isVisible();
-      }).some(function (layer) {
-        layer.hooks.beforePickingEncode.call();
-
-        if (layer.masks.length > 0) {
-          // 清除上一次的模版缓存
-          _this2.rendererService.clear({
-            stencil: 0,
-            depth: 1,
-            framebuffer: null
-          });
-
-          layer.masks.map(function (m) {
-            m.hooks.beforeRender.call();
-            m.render();
-            m.hooks.afterRender.call();
-          });
-        }
-
-        layer.renderModels(true);
-        layer.hooks.afterPickingEncode.call();
-
-        var layerPicked = _this2.pickingService.pickFromPickingFBO(layer, target); // RasterLayer 不参与拾取后的 shader 计算
-
-
-        if (layerPicked && _this2.parent.type !== 'RasterLayer') {
-          _this2.emit('pick', {
-            type: target.type,
-            pickedColors: _this2.pickingService.pickedColors,
-            layer: layer
-          });
-
-          _this2.pickingService.pickedTileLayers = [_this2.parent];
-        }
-
-        return layerPicked;
-      });
-
-      if (this.parent.type !== 'RasterLayer' && !isPicked && this.isLastPicked && target.type !== 'click') {
-        // 只有上一次有被高亮选中，本次未选中的时候才需要清除选中状态
-        this.pickingService.pickedTileLayers = [];
-        this.emit('unpick', {});
-        this.beforeHighlight([0, 0, 0]);
-      }
-
-      this.isLastPicked = isPicked;
-      return isPicked;
-    }
-  }, {
-    key: "clearPick",
-    value: function clearPick() {
-      this.children.filter(function (child) {
-        return child.inited && child.isVisible();
-      }).map(function (layer) {
-        layer.hooks.beforeSelect.call([0, 0, 0]);
-      });
-      this.pickingService.pickedTileLayers = [];
-    }
-  }, {
-    key: "beforeHighlight",
-    value: function beforeHighlight(pickedColors) {
-      this.children.filter(function (child) {
-        return child.inited && child.isVisible();
-      }).map(function (child) {
-        child.hooks.beforeHighlight.call(pickedColors);
-      });
-    }
-  }, {
-    key: "beforeSelect",
-    value: function beforeSelect(pickedColors) {
-      this.children.filter(function (child) {
-        return child.inited && child.isVisible();
-      }).map(function (layer) {
-        layer.hooks.beforeSelect.call(pickedColors);
-      });
-    }
-  }, {
-    key: "destroy",
-    value: function destroy() {
-      this.removeAllListeners();
-    }
-  }]);
-
-  return TilePickService;
-}(EventEmitter);

package/es/tile/manager/layerManager.d.ts

@@ -1,19 +0,0 @@
-import { IInteractionTarget, ILayer, IMapService, IPickingService, IRendererService, ITileLayerManager, ITilePickService, ITileRenderService, ITransform } from '@antv/l7-core';
-import { Base } from './base';
-import { ITileStyleService } from '../style/TileStyleService';
-export declare class TileLayerManager extends Base implements ITileLayerManager {
-    tilePickService: ITilePickService;
-    tileStyleService: ITileStyleService;
-    tileRenderService: ITileRenderService;
-    private transforms;
-    constructor(parent: ILayer, mapService: IMapService, rendererService: IRendererService, pickingService: IPickingService, transforms: ITransform[]);
-    render(): void;
-    pickLayers(target: IInteractionTarget): boolean;
-    private setSubLayerInitOption;
-    private getInitOptionValue;
-    private setInitOptionValue;
-    private setConfigListener;
-    private updateAttribute;
-    private updateStyle;
-    destroy(): void;
-}