@antv/l7-layers 2.10.3 → 2.10.4

package/lib/wind/models/wind.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"));
@@ -93,99 +89,103 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    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);
-      }));
+    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]
+        });
 
-      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: _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([]);
+      });
+    }
   }, {
     key: "getWindSize",
     value: function getWindSize() {
@@ -200,32 +200,9 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     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: "clearModels",
     value: function clearModels() {
@@ -335,16 +312,18 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
       var _ref3 = this.layer.getLayerConfig(),
           opacity = _ref3.opacity;
 
-      this.layerService.beforeRenderData(this.layer);
-      this.layer.hooks.beforeRender.call();
-      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,
           u_texture: this.texture
         }
       });
-      this.layer.hooks.afterRender.call();
     }
   }]);
   return WindModel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.10.3",
+  "version": "2.10.4",
   "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.9",
-    "@antv/l7-core": "2.10.3",
-    "@antv/l7-maps": "2.10.3",
-    "@antv/l7-source": "2.10.3",
-    "@antv/l7-utils": "2.10.3",
+    "@antv/async-hook": "^2.2.2",
+    "@antv/l7-core": "2.10.4",
+    "@antv/l7-maps": "2.10.4",
+    "@antv/l7-source": "2.10.4",
+    "@antv/l7-utils": "2.10.4",
     "@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": "306900eeb5c60dbbee4331a44e42e101b711ba0d",
+  "gitHead": "4b25604adb5e066ef9779b3c52ae759a76c563c1",
   "publishConfig": {
     "access": "public"
   }

package/es/core/LayerPickService.d.ts

@@ -1,9 +0,0 @@
-import { IInteractionTarget, ILayer, ILayerPickService } from '@antv/l7-core';
-export default class BaseLayerPickService implements ILayerPickService {
-    private layer;
-    constructor(layer: ILayer);
-    pickRender(target: IInteractionTarget): void;
-    selectFeature(pickedColors: Uint8Array | undefined): void;
-    highlightPickedFeature(pickedColors: Uint8Array | undefined): void;
-    getFeatureById(pickedFeatureIdx: number): any;
-}

package/es/core/LayerPickService.js

@@ -1,85 +0,0 @@
-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 _regeneratorRuntime from "@babel/runtime/regenerator";
-
-var BaseLayerPickService = /*#__PURE__*/function () {
-  function BaseLayerPickService(layer) {
-    _classCallCheck(this, BaseLayerPickService);
-
-    this.layer = layer;
-  }
-
-  _createClass(BaseLayerPickService, [{
-    key: "pickRender",
-    value: function pickRender(target) {
-      var layer = this.layer; // 拾取绘制
-
-      if (layer.tileLayer) {
-        return layer.tileLayer.pickRender(target);
-      }
-
-      layer.hooks.beforePickingEncode.call();
-
-      if (layer.masks.length > 0) {
-        // 若存在 mask，则在 pick 阶段的绘制也启用
-        layer.masks.map( /*#__PURE__*/function () {
-          var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(m) {
-            return _regeneratorRuntime.wrap(function _callee$(_context) {
-              while (1) {
-                switch (_context.prev = _context.next) {
-                  case 0:
-                    m.render();
-
-                  case 1:
-                  case "end":
-                    return _context.stop();
-                }
-              }
-            }, _callee);
-          }));
-
-          return function (_x) {
-            return _ref.apply(this, arguments);
-          };
-        }());
-      }
-
-      layer.renderModels(true);
-      layer.hooks.afterPickingEncode.call();
-    }
-  }, {
-    key: "selectFeature",
-    value: function selectFeature(pickedColors) {
-      var layer = this.layer; // @ts-ignore
-
-      var _pickedColors = _slicedToArray(pickedColors, 3),
-          r = _pickedColors[0],
-          g = _pickedColors[1],
-          b = _pickedColors[2];
-
-      layer.hooks.beforeSelect.call([r, g, b]);
-    }
-  }, {
-    key: "highlightPickedFeature",
-    value: function highlightPickedFeature(pickedColors) {
-      // @ts-ignore
-      var _pickedColors2 = _slicedToArray(pickedColors, 3),
-          r = _pickedColors2[0],
-          g = _pickedColors2[1],
-          b = _pickedColors2[2];
-
-      this.layer.hooks.beforeHighlight.call([r, g, b]);
-    }
-  }, {
-    key: "getFeatureById",
-    value: function getFeatureById(pickedFeatureIdx) {
-      return this.layer.getSource().getFeatureById(pickedFeatureIdx);
-    }
-  }]);
-
-  return BaseLayerPickService;
-}();
-
-export { BaseLayerPickService as default };

package/es/tile/service/TileLayerService.d.ts

@@ -1,33 +0,0 @@
-import { ILayer, ILayerService, ILngLat, IRendererService, ITile } from '@antv/l7-core';
-import { SourceTile } from '@antv/l7-utils';
-import 'reflect-metadata';
-interface TileLayerServiceOptions {
-    rendererService: IRendererService;
-    layerService: ILayerService;
-    parent: ILayer;
-}
-export declare class TileLayerService {
-    /**
-     * tileResource 用于存储瓦片的全局资源
-     */
-    tileResource: Map<any, any>;
-    private rendererService;
-    private layerService;
-    private parent;
-    private _tiles;
-    constructor({ rendererService, layerService, parent }: TileLayerServiceOptions);
-    get tiles(): ITile[];
-    hasTile(tileKey: string): boolean;
-    addTile(tile: ITile): void;
-    getTile(tileKey: string): ITile | undefined;
-    getVisibleTileBylngLat(lngLat: ILngLat): ITile | undefined;
-    removeTile(tileKey: string): void;
-    updateTileVisible(sourceTile: SourceTile): void;
-    beforeRender(): void;
-    render(): Promise<void>;
-    getRenderLayers(): ILayer[];
-    getLayers(): ILayer[];
-    getTiles(): ITile[];
-    destroy(): void;
-}
-export {};

package/es/tile/service/TileLayerService.js

@@ -1,172 +0,0 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-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 _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import 'reflect-metadata';
-export var TileLayerService = /*#__PURE__*/function () {
-  /**
-   * tileResource 用于存储瓦片的全局资源
-   */
-  function TileLayerService(_ref) {
-    var rendererService = _ref.rendererService,
-        layerService = _ref.layerService,
-        parent = _ref.parent;
-
-    _classCallCheck(this, TileLayerService);
-
-    _defineProperty(this, "tileResource", new Map());
-
-    _defineProperty(this, "_tiles", []);
-
-    this.rendererService = rendererService;
-    this.layerService = layerService;
-    this.parent = parent;
-  }
-
-  _createClass(TileLayerService, [{
-    key: "tiles",
-    get: function get() {
-      return this._tiles;
-    }
-  }, {
-    key: "hasTile",
-    value: function hasTile(tileKey) {
-      return this._tiles.some(function (tile) {
-        return tile.key === tileKey;
-      });
-    }
-  }, {
-    key: "addTile",
-    value: function addTile(tile) {
-      this._tiles.push(tile);
-    }
-  }, {
-    key: "getTile",
-    value: function getTile(tileKey) {
-      return this._tiles.find(function (tile) {
-        return tile.key === tileKey;
-      });
-    }
-  }, {
-    key: "getVisibleTileBylngLat",
-    value: function getVisibleTileBylngLat(lngLat) {
-      // 加载完成 & 可见 & 鼠标选中
-      return this._tiles.find(function (tile) {
-        return tile.isLoaded && tile.visible && tile.lnglatInBounds(lngLat);
-      });
-    }
-  }, {
-    key: "removeTile",
-    value: function removeTile(tileKey) {
-      var index = this._tiles.findIndex(function (tile) {
-        return tile.key === tileKey;
-      });
-
-      var tile = this._tiles.splice(index, 1);
-
-      tile[0] && tile[0].destroy();
-    }
-  }, {
-    key: "updateTileVisible",
-    value: function updateTileVisible(sourceTile) {
-      var tile = this.getTile(sourceTile.key);
-      tile === null || tile === void 0 ? void 0 : tile.updateVisible(sourceTile.isVisible);
-    }
-  }, {
-    key: "beforeRender",
-    value: function beforeRender() {// TODO 统一处理状态更新 attribute style
-    }
-  }, {
-    key: "render",
-    value: function () {
-      var _render = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _this = this;
-
-        var layers;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                layers = this.getRenderLayers();
-                layers.map( /*#__PURE__*/function () {
-                  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
-                    return _regeneratorRuntime.wrap(function _callee$(_context) {
-                      while (1) {
-                        switch (_context.prev = _context.next) {
-                          case 0:
-                            _context.next = 2;
-                            return _this.layerService.renderLayer(layer);
-
-                          case 2:
-                          case "end":
-                            return _context.stop();
-                        }
-                      }
-                    }, _callee);
-                  }));
-
-                  return function (_x) {
-                    return _ref2.apply(this, arguments);
-                  };
-                }());
-
-              case 2:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function render() {
-        return _render.apply(this, arguments);
-      }
-
-      return render;
-    }()
-  }, {
-    key: "getRenderLayers",
-    value: function getRenderLayers() {
-      var tileList = this._tiles.filter(function (t) {
-        return t.visible && t.isLoaded;
-      });
-
-      var layers = [];
-      tileList.map(function (tile) {
-        return layers.push.apply(layers, _toConsumableArray(tile.getLayers()));
-      });
-      return layers;
-    }
-  }, {
-    key: "getLayers",
-    value: function getLayers() {
-      var tileList = this._tiles.filter(function (t) {
-        return t.isLoaded;
-      });
-
-      var layers = [];
-      tileList.map(function (tile) {
-        return layers.push.apply(layers, _toConsumableArray(tile.getLayers()));
-      });
-      return layers;
-    }
-  }, {
-    key: "getTiles",
-    value: function getTiles() {
-      return this._tiles;
-    }
-  }, {
-    key: "destroy",
-    value: function destroy() {
-      this._tiles.forEach(function (t) {
-        return t.destroy();
-      });
-
-      this.tileResource.clear();
-    }
-  }]);
-
-  return TileLayerService;
-}();

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

@@ -1,22 +0,0 @@
-import { ILayerService, ITilePickService, IInteractionTarget } from '@antv/l7-core';
-import { TileLayerService } from './TileLayerService';
-export interface ITilePickServiceOptions {
-    layerService: ILayerService;
-    tileLayerService: TileLayerService;
-}
-export declare class TilePickService implements ITilePickService {
-    private layerService;
-    private tileLayerService;
-    private tileSourceService;
-    private tilePickID;
-    constructor({ layerService, tileLayerService }: ITilePickServiceOptions);
-    pickRender(target: IInteractionTarget): void;
-    selectFeature(pickedColors: Uint8Array | undefined): void;
-    highlightPickedFeature(pickedColors: Uint8Array | undefined): void;
-    updateHighLight(r: number, g: number, b: number, type: string): void;
-    setPickState(): void;
-    private clor2PickId;
-    private pickId2Color;
-    /** 从瓦片中根据数据 */
-    getFeatureById(pickedFeatureIdx: number): any;
-}