@antv/l7-layers 2.9.27-alpha.2 → 2.9.27-alpha.3

package/lib/tile/tileLayer/baseTileLayer.js

@@ -21,6 +21,8 @@ var _l7Utils = require("@antv/l7-utils");
 
 var _tileLayerManager = require("../manager/tileLayerManager");
 
+var _lodash = require("lodash");
+
 var BaseTileLayer = /*#__PURE__*/function () {
   function BaseTileLayer(_ref) {
     var _parentSource$data;
@@ -38,18 +40,17 @@ var BaseTileLayer = /*#__PURE__*/function () {
       select: null,
       active: null
     });
+    (0, _defineProperty2.default)(this, "viewchange", (0, _lodash.debounce)(this.mapchange, 200));
     var parentSource = parent.getSource();
 
     var _ref2 = (parentSource === null || parentSource === void 0 ? void 0 : (_parentSource$data = parentSource.data) === null || _parentSource$data === void 0 ? void 0 : _parentSource$data.tilesetOptions) || {},
-        sourceLayer = _ref2.sourceLayer,
-        coords = _ref2.coords,
-        featureId = _ref2.featureId;
+        sourceLayer = _ref2.sourceLayer;
 
     this.sourceLayer = sourceLayer;
     this.parent = parent;
     this.mapService = mapService;
     this.layerService = layerService;
-    this.tileLayerManager = new _tileLayerManager.TileLayerManager(parent, mapService, rendererService, pickingService, layerService, transforms);
+    this.tileLayerManager = new _tileLayerManager.TileLayerManager(parent, mapService, rendererService, pickingService, transforms);
     this.initTileSetManager();
     this.bindSubLayerEvent();
     this.bindSubLayerPick();
@@ -126,35 +127,11 @@ var BaseTileLayer = /*#__PURE__*/function () {
   }, {
     key: "tileUpdate",
     value: function tileUpdate() {
-      var _this2 = this;
-
       // Base Function
       if (!this.tilesetManager) {
         return;
       }
 
-      this.tilesetManager.tiles.filter(function (tile) {
-        return tile.isLoaded;
-      }).map(function (tile) {
-        if (tile.layerIDList.length === 0) {
-          var _this2$tileLayerManag = _this2.tileLayerManager.createTile(tile),
-              layers = _this2$tileLayerManag.layers,
-              layerIDList = _this2$tileLayerManag.layerIDList;
-
-          tile.layerIDList = layerIDList;
-
-          _this2.tileLayerManager.addChilds(layers);
-        } else {
-          if (!tile.isVisibleChange) {
-            return;
-          }
-
-          var _layers = _this2.tileLayerManager.getChilds(tile.layerIDList);
-
-          _this2.tileLayerManager.updateLayersConfig(_layers, 'visible', tile.isVisible);
-        }
-      });
-
       if (this.tilesetManager.isLoaded) {
         // 将事件抛出，图层上可以使用瓦片
         this.parent.emit('tiles-loaded', this.tilesetManager.currentTiles);
@@ -163,12 +140,12 @@ var BaseTileLayer = /*#__PURE__*/function () {
   }, {
     key: "setPickState",
     value: function setPickState(layers) {
-      var _this3 = this;
+      var _this2 = this;
 
       if (this.pickColors.select) {
         var selectedId = (0, _l7Utils.decodePickingColor)(this.pickColors.select);
         layers.map(function (layer) {
-          _this3.selectFeature(layer, _this3.pickColors.select);
+          _this2.selectFeature(layer, _this2.pickColors.select);
 
           layer.setCurrentSelectedId(selectedId);
         });
@@ -180,7 +157,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
         layers.filter(function (layer) {
           return layer.inited && layer.isVisible();
         }).map(function (layer) {
-          layer.hooks.beforeHighlight.call(_this3.pickColors.active);
+          layer.hooks.beforeHighlight.call(_this2.pickColors.active);
           layer.setCurrentPickId(_selectedId);
         });
       }
@@ -188,7 +165,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
   }, {
     key: "bindSubLayerPick",
     value: function bindSubLayerPick() {
-      var _this4 = this;
+      var _this3 = this;
 
       this.tileLayerManager.tilePickManager.on('pick', function (e) {
         // @ts-ignore
@@ -198,19 +175,19 @@ var BaseTileLayer = /*#__PURE__*/function () {
             b = _e$pickedColors[2];
 
         if (e.type === 'click') {
-          var restLayers = _this4.children.filter(function (child) {
+          var restLayers = _this3.children.filter(function (child) {
             return child.inited && child.isVisible() && child.isVector;
           }).filter(function (child) {
             return child !== e.layer;
           });
 
-          _this4.setSelect(restLayers, [r, g, b]);
+          _this3.setSelect(restLayers, [r, g, b]);
         } else {
-          _this4.setHighlight([r, g, b]);
+          _this3.setHighlight([r, g, b]);
         }
       });
       this.tileLayerManager.tilePickManager.on('unpick', function () {
-        _this4.pickColors.active = null;
+        _this3.pickColors.active = null;
       });
     }
   }, {
@@ -233,21 +210,21 @@ var BaseTileLayer = /*#__PURE__*/function () {
   }, {
     key: "setSelect",
     value: function setSelect(layers, pickedColors) {
-      var _this5 = this;
+      var _this4 = this;
 
       var selectedId = (0, _l7Utils.decodePickingColor)(pickedColors);
       layers.map(function (layer) {
         if (layer.getCurrentSelectedId() === null || selectedId !== layer.getCurrentSelectedId()) {
-          _this5.selectFeature(layer, pickedColors);
+          _this4.selectFeature(layer, pickedColors);
 
           layer.setCurrentSelectedId(selectedId);
-          _this5.pickColors.select = pickedColors;
+          _this4.pickColors.select = pickedColors;
         } else {
-          _this5.selectFeature(layer, new Uint8Array([0, 0, 0, 0])); // toggle select
+          _this4.selectFeature(layer, new Uint8Array([0, 0, 0, 0])); // toggle select
 
 
           layer.setCurrentSelectedId(null);
-          _this5.pickColors.select = null;
+          _this4.pickColors.select = null;
         }
       }); // unselect normal layer
 
@@ -257,7 +234,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
       }).filter(function (layer) {
         return layer.getCurrentSelectedId() !== null;
       }).map(function (layer) {
-        _this5.selectFeature(layer, new Uint8Array([0, 0, 0, 0]));
+        _this4.selectFeature(layer, new Uint8Array([0, 0, 0, 0]));
 
         layer.setCurrentSelectedId(null);
       });
@@ -276,7 +253,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
   }, {
     key: "bindSubLayerEvent",
     value: function bindSubLayerEvent() {
-      var _this6 = this;
+      var _this5 = this;
 
       /**
        * layer.on('click', (ev) => {}); // 鼠标左键点击图层事件
@@ -296,41 +273,41 @@ var BaseTileLayer = /*#__PURE__*/function () {
        * layer.on('unpick', (ev) => {}); // 图层外的操作的所有事件
        */
       this.parent.on('subLayerClick', function (e) {
-        _this6.parent.emit('click', (0, _objectSpread2.default)({}, e));
+        _this5.parent.emit('click', (0, _objectSpread2.default)({}, e));
       });
       this.parent.on('subLayerMouseMove', function (e) {
-        return _this6.parent.emit('mousemove', (0, _objectSpread2.default)({}, e));
+        return _this5.parent.emit('mousemove', (0, _objectSpread2.default)({}, e));
       });
       this.parent.on('subLayerMouseUp', function (e) {
-        return _this6.parent.emit('mouseup', (0, _objectSpread2.default)({}, e));
+        return _this5.parent.emit('mouseup', (0, _objectSpread2.default)({}, e));
       });
       this.parent.on('subLayerMouseEnter', function (e) {
-        return _this6.parent.emit('mouseenter', (0, _objectSpread2.default)({}, e));
+        return _this5.parent.emit('mouseenter', (0, _objectSpread2.default)({}, e));
       });
       this.parent.on('subLayerMouseOut', function (e) {
-        return _this6.parent.emit('mouseout', (0, _objectSpread2.default)({}, e));
+        return _this5.parent.emit('mouseout', (0, _objectSpread2.default)({}, e));
       });
       this.parent.on('subLayerMouseDown', function (e) {
-        return _this6.parent.emit('mousedown', (0, _objectSpread2.default)({}, e));
+        return _this5.parent.emit('mousedown', (0, _objectSpread2.default)({}, e));
       });
       this.parent.on('subLayerContextmenu', function (e) {
-        return _this6.parent.emit('contextmenu', (0, _objectSpread2.default)({}, e));
+        return _this5.parent.emit('contextmenu', (0, _objectSpread2.default)({}, e));
       }); // vector layer 图层外事件
 
       this.parent.on('subLayerUnClick', function (e) {
-        return _this6.parent.emit('unclick', (0, _objectSpread2.default)({}, e));
+        return _this5.parent.emit('unclick', (0, _objectSpread2.default)({}, e));
       });
       this.parent.on('subLayerUnMouseMove', function (e) {
-        return _this6.parent.emit('unmousemove', (0, _objectSpread2.default)({}, e));
+        return _this5.parent.emit('unmousemove', (0, _objectSpread2.default)({}, e));
       });
       this.parent.on('subLayerUnMouseUp', function (e) {
-        return _this6.parent.emit('unmouseup', (0, _objectSpread2.default)({}, e));
+        return _this5.parent.emit('unmouseup', (0, _objectSpread2.default)({}, e));
       });
       this.parent.on('subLayerUnMouseDown', function (e) {
-        return _this6.parent.emit('unmousedown', (0, _objectSpread2.default)({}, e));
+        return _this5.parent.emit('unmousedown', (0, _objectSpread2.default)({}, e));
       });
       this.parent.on('subLayerUnContextmenu', function (e) {
-        return _this6.parent.emit('uncontextmenu', (0, _objectSpread2.default)({}, e));
+        return _this5.parent.emit('uncontextmenu', (0, _objectSpread2.default)({}, e));
       });
     }
   }, {
@@ -369,12 +346,12 @@ var BaseTileLayer = /*#__PURE__*/function () {
           this.parent.updateLayerConfig({
             visible: false
           });
-          this.layerService.updateLayerRenderList();
+          this.layerService.reRender();
         } else if (zoom >= 3 && !visible) {
           this.parent.updateLayerConfig({
             visible: true
           });
-          this.layerService.updateLayerRenderList();
+          this.layerService.reRender();
         }
       }
 
@@ -386,49 +363,43 @@ var BaseTileLayer = /*#__PURE__*/function () {
         zoom: zoom,
         latLonBounds: latLonBounds
       };
-
-      if (this.timer) {
-        clearTimeout(this.timer);
-        this.timer = null;
-      } // this.timer = setTimeout(() => {
-
-
-      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.update(zoom, latLonBounds); // }, 250);
+      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.update(zoom, latLonBounds);
     }
   }, {
     key: "bindTilesetEvent",
     value: function bindTilesetEvent() {
-      var _this7 = this;
+      var _this6 = this;
 
       if (!this.tilesetManager) {
         return;
       } // 瓦片数据加载成功
 
 
-      this.tilesetManager.on('tile-loaded', function (tile) {// todo: 将事件抛出，图层上可以监听使用
+      this.tilesetManager.on('tile-loaded', function (tile) {// 将事件抛出，图层上可以监听使用
       }); // 瓦片数据从缓存删除或被执行重新加载
 
       this.tilesetManager.on('tile-unload', function (tile) {
-        // todo: 将事件抛出，图层上可以监听使用
-        _this7.tileUnLoad(tile);
+        // 将事件抛出，图层上可以监听使用
+        _this6.tileUnLoad(tile);
       }); // 瓦片数据加载失败
 
       this.tilesetManager.on('tile-error', function (error, tile) {
-        // todo: 将事件抛出，图层上可以监听使用
-        _this7.tileError(error);
+        // 将事件抛出，图层上可以监听使用
+        _this6.tileError(error);
       }); // 瓦片显隐状态更新
 
       this.tilesetManager.on('tile-update', function () {
-        _this7.tileUpdate();
+        _this6.tileUpdate();
       }); // 地图视野发生改变
 
       this.mapService.on('zoomend', function () {
-        return _this7.mapchange();
+        return _this6.viewchange();
       });
       this.mapService.on('moveend', function () {
-        return _this7.mapchange();
+        return _this6.viewchange();
       });
-    }
+    } //  防抖操作
+
   }, {
     key: "getCurrentView",
     value: function getCurrentView() {

package/lib/tile/tileTest.js

@@ -49,7 +49,8 @@ var TileDebugLayer = /*#__PURE__*/function (_BaseLayer) {
       data: [],
       options: {
         parser: {
-          type: 'testTile'
+          type: 'testTile',
+          cancelExtent: true
         }
       }
     });
@@ -65,7 +66,7 @@ var TileDebugLayer = /*#__PURE__*/function (_BaseLayer) {
       this.layerModel.initModels(function (models) {
         _this2.models = models;
 
-        _this2.renderLayers();
+        _this2.emit('modelLoaded', null);
       });
     }
   }]);

package/lib/tile/tmsMapTileLayer.js

@@ -0,0 +1,136 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TMSBaseMapTileLayer = void 0;
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+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 _baseMapTileLayer = _interopRequireDefault(require("./tileLayer/baseMapTileLayer"));
+
+var _utils = require("./utils");
+
+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 TMSBaseMapTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
+  (0, _inherits2.default)(TMSBaseMapTileLayer, _BaseTileLayer);
+
+  var _super = _createSuper(TMSBaseMapTileLayer);
+
+  function TMSBaseMapTileLayer() {
+    var _this;
+
+    (0, _classCallCheck2.default)(this, TMSBaseMapTileLayer);
+
+    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", 'BaseMapTMS');
+    return _this;
+  }
+
+  (0, _createClass2.default)(TMSBaseMapTileLayer, [{
+    key: "tileUnLoad",
+    value: function tileUnLoad(tile) {
+      this.tileLayerManager.removeChilds(tile.layerIDList, false);
+    }
+  }, {
+    key: "tileUpdate",
+    value: function tileUpdate() {
+      var _this2 = this;
+
+      if (!this.tilesetManager) {
+        return;
+      }
+
+      this.tilesetManager.tiles.filter(function (tile) {
+        return tile.isLoaded;
+      }).map(function (tile) {
+        var _tile$data;
+
+        if ((_tile$data = tile.data) !== null && _tile$data !== void 0 && _tile$data.layers && _this2.sourceLayer) {
+          // vector
+          var vectorTileLayer = tile.data.layers[_this2.sourceLayer];
+          var features = vectorTileLayer === null || vectorTileLayer === void 0 ? void 0 : vectorTileLayer.features;
+
+          if (!(Array.isArray(features) && features.length > 0)) {
+            return;
+          }
+        }
+
+        if (!tile.parentLayerIDList.includes(_this2.parent.id)) {
+          var _tile$layerIDList;
+
+          var _this2$tileLayerManag = _this2.tileLayerManager.createTile(tile),
+              layers = _this2$tileLayerManag.layers,
+              layerIDList = _this2$tileLayerManag.layerIDList;
+
+          tile.parentLayerIDList.push(_this2.parent.id);
+
+          (_tile$layerIDList = tile.layerIDList).push.apply(_tile$layerIDList, (0, _toConsumableArray2.default)(layerIDList));
+
+          _this2.tileLayerManager.addChilds(layers);
+        } else {
+          if (!tile.isVisibleChange) {
+            return;
+          }
+
+          var _layers = _this2.tileLayerManager.getChilds(tile.layerIDList);
+
+          _this2.updateTileVisible(tile, _layers);
+        }
+      });
+
+      if (this.tilesetManager.isLoaded) {
+        // 将事件抛出，图层上可以使用瓦片
+        this.parent.emit('tiles-loaded', this.tilesetManager.currentTiles);
+      }
+    }
+  }, {
+    key: "emitTileVisibleEvent",
+    value: function emitTileVisibleEvent(tile, callback) {
+      if (tile.isVisible) {
+        callback();
+      } else {
+        (0, _utils.tileAllLoad)(tile, function () {
+          callback();
+        });
+      }
+    }
+  }, {
+    key: "updateTileVisible",
+    value: function updateTileVisible(tile, layers) {
+      var _this3 = this;
+
+      this.emitTileVisibleEvent(tile, function () {
+        _this3.tileLayerManager.updateLayersConfig(layers, 'visible', tile.isVisible);
+
+        _this3.layerService.reRender();
+      });
+    }
+  }]);
+  return TMSBaseMapTileLayer;
+}(_baseMapTileLayer.default);
+
+exports.TMSBaseMapTileLayer = TMSBaseMapTileLayer;

package/lib/tile/tmsTileLayer.js

@@ -25,6 +25,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _baseTileLayer = _interopRequireDefault(require("./tileLayer/baseTileLayer"));
 
+var _utils = require("./utils");
+
 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; } }
@@ -98,18 +100,39 @@ var TMSTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
 
           var _layers = _this2.tileLayerManager.getChilds(tile.layerIDList);
 
-          _this2.tileLayerManager.updateLayersConfig(_layers, 'visible', tile.isVisible);
+          _this2.updateTileVisible(tile, _layers);
 
           _this2.setPickState(_layers);
         }
       });
-      this.parent.renderLayers();
 
       if (this.tilesetManager.isLoaded) {
         // 将事件抛出，图层上可以使用瓦片
         this.parent.emit('tiles-loaded', this.tilesetManager.currentTiles);
       }
     }
+  }, {
+    key: "emitTileVisibleEvent",
+    value: function emitTileVisibleEvent(tile, callback) {
+      if (tile.isVisible) {
+        callback();
+      } else {
+        (0, _utils.tileAllLoad)(tile, function () {
+          callback();
+        });
+      }
+    }
+  }, {
+    key: "updateTileVisible",
+    value: function updateTileVisible(tile, layers) {
+      var _this3 = this;
+
+      this.emitTileVisibleEvent(tile, function () {
+        _this3.tileLayerManager.updateLayersConfig(layers, 'visible', tile.isVisible);
+
+        _this3.layerService.reRender();
+      });
+    }
   }]);
   return TMSTileLayer;
 }(_baseTileLayer.default);

package/lib/tile/utils.js

@@ -8,10 +8,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.getContainerSize = getContainerSize;
 exports.getLayerShape = getLayerShape;
 exports.getMaskValue = getMaskValue;
+exports.isTileChildLoaded = isTileChildLoaded;
+exports.isTileLoaded = isTileLoaded;
+exports.isTileParentLoaded = isTileParentLoaded;
 exports.isVectorTile = isVectorTile;
 exports.readPixel = readPixel;
 exports.readRasterValue = readRasterValue;
 exports.registerLayers = registerLayers;
+exports.tileAllLoad = tileAllLoad;
 exports.tileVectorParser = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -155,4 +159,38 @@ function readPixel(x, y, rendererService) {
     data: new Uint8Array(1 * 1 * 4)
   });
   return pickedColors;
+}
+
+function isTileLoaded(tile) {
+  return tile.layerIDList.length === tile.loadedLayers;
+}
+
+function isTileChildLoaded(tile) {
+  var childs = tile.children;
+  return childs.filter(function (child) {
+    return isTileLoaded(child);
+  }).length === childs.length;
+}
+
+function isTileParentLoaded(tile) {
+  var parent = tile.parent;
+
+  if (!parent) {
+    return true;
+  } else {
+    return isTileLoaded(parent);
+  }
+}
+
+function tileAllLoad(tile, callback) {
+  var timer = window.setInterval(function () {
+    var tileLoaded = isTileLoaded(tile);
+    var tileChildLoaded = isTileChildLoaded(tile);
+    var tileParentLoaded = isTileParentLoaded(tile);
+
+    if (tileLoaded && tileChildLoaded && tileParentLoaded) {
+      callback();
+      window.clearInterval(timer);
+    }
+  }, 36);
 }

package/lib/utils/dataMappingStyle.js

@@ -29,6 +29,9 @@ function registerStyleAttribute(fieldName, layer, field, values, updateOptions)
 
 
 function handleStyleDataMapping(configToUpdate, layer) {
+  // 瓦片图层不需要进行样式数据映射
+  if (layer.tileLayer || layer.isTileLayer) return;
+
   if (configToUpdate.opacity) {
     // 处理 style 中 opacity 属性的数据映射
     handleStyleFloat('opacity', layer, configToUpdate.opacity);

package/lib/utils/layerData.js

@@ -28,7 +28,7 @@ function adjustData2Amap2Coordinates(mappedData, mapService) {
     if (typeof mappedData[0].coordinates[0] === 'number') {
       // 单个的点数据
       // @ts-ignore
-      mappedData // TODO: 避免经纬度被重复计算导致坐标位置偏移
+      mappedData // 避免经纬度被重复计算导致坐标位置偏移
       .filter(function (d) {
         return !d.originCoordinates;
       }).map(function (d) {
@@ -42,7 +42,7 @@ function adjustData2Amap2Coordinates(mappedData, mapService) {
     } else {
       // 连续的线、面数据
       // @ts-ignore
-      mappedData // TODO: 避免经纬度被重复计算导致坐标位置偏移
+      mappedData // 避免经纬度被重复计算导致坐标位置偏移
       .filter(function (d) {
         return !d.originCoordinates;
       }).map(function (d) {

package/lib/utils/updateShape.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateShape = updateShape;
-// TODO: shapeUpdateList 存储一系列的 shape 类型
+// shapeUpdateList 存储一系列的 shape 类型
 // 当这一系列的 shape 相互切换的时候需要重构 layer 的 model (顶点数据集)
 var shapeUpdateList = [// PointLayer
 ['circle', 'cylinder'], ['square', 'cylinder'], ['triangle', 'cylinder'], ['pentagon', 'cylinder'], ['hexagon', 'cylinder'], ['octogon', 'cylinder'], ['hexagram', 'cylinder'], ['rhombus', 'cylinder'], ['vesica', 'cylinder']];
@@ -18,7 +18,7 @@ function updateShape(layer, lastShape, currentShape) {
 
     shapeUpdateList.map(function (shapes) {
       if (shapes.includes(lastShape) && shapes.includes(currentShape)) {
-        // TODO: dataSourceNeedUpdate 借用数据更新时更新 layer model 的工作流
+        // dataSourceNeedUpdate 借用数据更新时更新 layer model 的工作流
         layer.dataState.dataSourceNeedUpdate = true;
         return;
       }

package/lib/wind/index.js

@@ -58,7 +58,9 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
       this.layerModel.initModels(function (models) {
         _this2.models = models;
 
-        _this2.renderLayers();
+        _this2.emit('modelLoaded', null);
+
+        _this2.layerService.throttleRenderLayers();
       });
     }
   }, {
@@ -67,7 +69,9 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this3.models = models;
+
+        _this3.emit('modelLoaded', null);
       });
     }
   }, {

package/lib/wind/models/wind.js

@@ -39,7 +39,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var WindFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nvarying vec2 v_texCoord;\nvoid main() {\n  vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n  gl_FragColor = color;\n  gl_FragColor.a *= u_opacity;\n}\n";
 
 /* babel-plugin-inline-import '../shaders/wind_vert.glsl' */
-var WindVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
+var WindVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\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.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
 var defaultRampColors = {
   0.0: '#3288bd',
   0.1: '#66c2a5',
@@ -165,9 +165,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
           height: imageHeight
         });
 
-        _this3.layerService.updateLayerRenderList();
-
-        _this3.layerService.renderLayers();
+        _this3.layerService.reRender();
       });
       this.layer.buildLayerModel({
         moduleName: 'wind',
@@ -178,7 +176,9 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
         depth: {
           enable: false
         },
-        blend: this.getBlend()
+        stencil: (0, _l7Utils.getMask)(mask, maskInside),
+        blend: this.getBlend(),
+        pick: false
       }).then(function (model) {
         _this3.colorModel = model;
         callbackModel([model]);
@@ -241,7 +241,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
             type: _l7Core.gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }
@@ -307,7 +307,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
         var _this$wind$draw = this.wind.draw(),
             d = _this$wind$draw.d,
             w = _this$wind$draw.w,
-            h = _this$wind$draw.h; // TODO: 恢复 L7 渲染流程中 gl 状态
+            h = _this$wind$draw.h; // 恢复 L7 渲染流程中 gl 状态
 
 
         this.rendererService.setBaseState();