@antv/l7-layers 2.15.5 → 2.16.1

package/lib/tile/manager/base.js

@@ -1,65 +1,89 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Base = void 0;
+
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _l7Core = require("@antv/l7-core");
+
 var _utils = require("../style/utils");
+
 var Base = /*#__PURE__*/function () {
   function Base() {
     (0, _classCallCheck2.default)(this, Base);
     (0, _defineProperty2.default)(this, "tileCache", new Map());
     (0, _defineProperty2.default)(this, "tileLayerCache", new Map());
   }
+
   (0, _createClass2.default)(Base, [{
     key: "initTileLayers",
     value: function () {
       var _initTileLayers = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(layers, tile) {
         var _this = this;
+
         return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              return _context2.abrupt("return", Promise.all(layers.map( /*#__PURE__*/function () {
-                var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer) {
-                  var container;
-                  return _regenerator.default.wrap(function _callee$(_context) {
-                    while (1) switch (_context.prev = _context.next) {
-                      case 0:
-                        container = (0, _l7Core.createLayerContainer)(_this.parent.sceneContainer);
-                        layer.setContainer(container, _this.parent.sceneContainer);
-                        _context.next = 4;
-                        return layer.init();
-                      case 4:
-                        _this.addChild(layer);
-                        tile.layerLoad();
-                        _this.render();
-                      case 7:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }, _callee);
-                }));
-                return function (_x3) {
-                  return _ref.apply(this, arguments);
-                };
-              }())));
-            case 1:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                return _context2.abrupt("return", Promise.all(layers.map( /*#__PURE__*/function () {
+                  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer) {
+                    var container;
+                    return _regenerator.default.wrap(function _callee$(_context) {
+                      while (1) {
+                        switch (_context.prev = _context.next) {
+                          case 0:
+                            container = (0, _l7Core.createLayerContainer)(_this.parent.sceneContainer);
+                            layer.setContainer(container, _this.parent.sceneContainer);
+                            _context.next = 4;
+                            return layer.init();
+
+                          case 4:
+                            _this.addChild(layer);
+
+                            tile.layerLoad();
+
+                            _this.render();
+
+                          case 7:
+                          case "end":
+                            return _context.stop();
+                        }
+                      }
+                    }, _callee);
+                  }));
+
+                  return function (_x3) {
+                    return _ref.apply(this, arguments);
+                  };
+                }())));
+
+              case 1:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2);
       }));
+
       function initTileLayers(_x, _x2) {
         return _initTileLayers.apply(this, arguments);
       }
+
       return initTileLayers;
     }()
   }, {
@@ -71,48 +95,55 @@ var Base = /*#__PURE__*/function () {
     key: "hasTile",
     value: function hasTile(tile) {
       return this.tileCache.has(tile.key);
-    }
+    } // 添加图层
 
-    // 添加图层
   }, {
     key: "addTile",
     value: function () {
       var _addTile = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(tile) {
         var layerCollections;
         return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              if (!this.hasTile(tile)) {
-                _context3.next = 2;
-                break;
-              }
-              return _context3.abrupt("return", {
-                layers: []
-              });
-            case 2:
-              // 存储当前 tile
-              this.tileCache.set(tile.key, tile);
-
-              // 创建 tile 对应的 layers
-              layerCollections = this.tileFactory.createTile(tile, this.initOptions); // // 初始化图层
-              _context3.next = 6;
-              return this.initTileLayers(layerCollections.layers, tile);
-            case 6:
-              this.tileLayerCache.set(tile.key, layerCollections.layers);
-              // const visible =  tile.parent ? tile.parent.children.every(t=>this.tileLayerCache.has(t.key)) : true
-              // tile.parent?.children.forEach((t)=>{
-              //   updateLayersConfig(this.getLayers(t),'visible',visible)
-              // })
-              return _context3.abrupt("return", layerCollections);
-            case 8:
-            case "end":
-              return _context3.stop();
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                if (!this.hasTile(tile)) {
+                  _context3.next = 2;
+                  break;
+                }
+
+                return _context3.abrupt("return", {
+                  layers: []
+                });
+
+              case 2:
+                // 存储当前 tile
+                this.tileCache.set(tile.key, tile); // 创建 tile 对应的 layers
+
+                layerCollections = this.tileFactory.createTile(tile, this.initOptions); // // 初始化图层
+
+                _context3.next = 6;
+                return this.initTileLayers(layerCollections.layers, tile);
+
+              case 6:
+                this.tileLayerCache.set(tile.key, layerCollections.layers); // const visible =  tile.parent ? tile.parent.children.every(t=>this.tileLayerCache.has(t.key)) : true
+                // tile.parent?.children.forEach((t)=>{
+                //   updateLayersConfig(this.getLayers(t),'visible',visible)
+                // })
+
+                return _context3.abrupt("return", layerCollections);
+
+              case 8:
+              case "end":
+                return _context3.stop();
+            }
           }
         }, _callee3, this);
       }));
+
       function addTile(_x4) {
         return _addTile.apply(this, arguments);
       }
+
       return addTile;
     }()
   }, {
@@ -132,6 +163,7 @@ var Base = /*#__PURE__*/function () {
     key: "addChildren",
     value: function addChildren(layers) {
       var _this$children;
+
       (_this$children = this.children).push.apply(_this$children, (0, _toConsumableArray2.default)(layers));
     }
   }, {
@@ -150,9 +182,11 @@ var Base = /*#__PURE__*/function () {
     key: "removeChild",
     value: function removeChild(layer) {
       var layerIndex = this.children.indexOf(layer);
+
       if (layerIndex > -1) {
         this.children.splice(layerIndex, 1);
       }
+
       layer.destroy();
     }
   }, {
@@ -161,6 +195,7 @@ var Base = /*#__PURE__*/function () {
       if (!tile) {
         return [];
       }
+
       return this.tileLayerCache.get(tile.key) || [];
     }
   }, {
@@ -185,8 +220,7 @@ var Base = /*#__PURE__*/function () {
     }
   }, {
     key: "initTileFactory",
-    value: function initTileFactory() {
-      // this.tileFactory = new TileFactory({
+    value: function initTileFactory() {// this.tileFactory = new TileFactory({
       //   parent: this.parent,
       //   mapService: this.mapService,
       //   rendererService: this.rendererService,
@@ -207,9 +241,11 @@ var Base = /*#__PURE__*/function () {
     key: "updateTileVisible",
     value: function updateTileVisible(tile, layerService) {
       var layers = this.getLayers(tile);
+
       if (layers.length === 0) {
         return;
       }
+
       if (tile.isVisible) {
         // 如果可见直接进行渲染，父级发
         (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
@@ -222,16 +258,16 @@ var Base = /*#__PURE__*/function () {
         //   console.log(`${t.x}/${t.y}/${t.z}`)
         // })
         (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
-      }
-
-      // this.listenLoad(tile, () => {
+      } // this.listenLoad(tile, () => {
       //   this.isTileAllLoad(tile) && updateLayersConfig(layers, 'visible', tile.isVisible);
       // })
+
     }
   }, {
     key: "listenLoad",
     value: function listenLoad(tile, callback) {
       var _tile$parent;
+
       tile.once('layerLoaded', function () {
         callback();
       });
@@ -250,6 +286,7 @@ var Base = /*#__PURE__*/function () {
       if (tile.isLoad) {
         return true;
       }
+
       var isLoad = this.getLayers(tile).length === tile.loadedLayers;
       tile.isLoad = isLoad;
       return isLoad;
@@ -258,9 +295,11 @@ var Base = /*#__PURE__*/function () {
     key: "isTileChildLoaded",
     value: function isTileChildLoaded(tile) {
       var _this2 = this;
+
       if (tile.isChildLoad) {
         return true;
       }
+
       var children = tile.children;
       var isLoad = children.filter(function (child) {
         return _this2.isTileLoaded(child);
@@ -272,6 +311,7 @@ var Base = /*#__PURE__*/function () {
     key: "isTileParentLoaded",
     value: function isTileParentLoaded(tile) {
       var parent = tile.parent;
+
       if (!parent) {
         return true;
       } else {
@@ -295,4 +335,5 @@ var Base = /*#__PURE__*/function () {
   }]);
   return Base;
 }();
+
 exports.Base = Base;

package/lib/tile/service/TileLayerService.js

@@ -1,26 +1,34 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TileLayerService = void 0;
+
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 require("reflect-metadata");
+
 var TileLayerService = /*#__PURE__*/function () {
   /**
    * tileResource 用于存储瓦片的全局资源
    */
-
   function TileLayerService(_ref) {
     var rendererService = _ref.rendererService,
-      layerService = _ref.layerService,
-      parent = _ref.parent;
+        layerService = _ref.layerService,
+        parent = _ref.parent;
     (0, _classCallCheck2.default)(this, TileLayerService);
     (0, _defineProperty2.default)(this, "tileResource", new Map());
     (0, _defineProperty2.default)(this, "layerTiles", []);
@@ -28,6 +36,7 @@ var TileLayerService = /*#__PURE__*/function () {
     this.layerService = layerService;
     this.parent = parent;
   }
+
   (0, _createClass2.default)(TileLayerService, [{
     key: "tiles",
     get: function get() {
@@ -67,6 +76,7 @@ var TileLayerService = /*#__PURE__*/function () {
         return t.key === tileKey;
       });
       var tile = this.layerTiles.splice(index, 1);
+
       if (tile[0]) {
         tile[0].destroy();
       }
@@ -74,8 +84,7 @@ var TileLayerService = /*#__PURE__*/function () {
   }, {
     key: "updateTileVisible",
     value: function updateTileVisible(sourceTile) {
-      var tile = this.getTile(sourceTile.key);
-      // if(sourceTile.isVisible) {
+      var tile = this.getTile(sourceTile.key); // if(sourceTile.isVisible) {
       //   // 不可见 => 可见 兄弟节点加载完成
       //   if(sourceTile.parent) {
       //     const flag = this.isChildrenLoaded(sourceTile.parent)
@@ -83,7 +92,6 @@ var TileLayerService = /*#__PURE__*/function () {
       //   } else {
       //     tile?.updateVisible(true);
       //   }
-
       // } else {
       //    // 可见 => 不可见 兄弟节点加载完成
       //    if(sourceTile.parent) {
@@ -93,8 +101,8 @@ var TileLayerService = /*#__PURE__*/function () {
       //     tile?.updateVisible(false);
       //   }
       // }
-      tile === null || tile === void 0 ? void 0 : tile.updateVisible(sourceTile.isVisible);
-      // if (sourceTile.isVisible) {
+
+      tile === null || tile === void 0 ? void 0 : tile.updateVisible(sourceTile.isVisible); // if (sourceTile.isVisible) {
       //   tile?.updateVisible(sourceTile.isVisible);
       // } else {
       //   this.removeTile(sourceTile.key);
@@ -104,26 +112,34 @@ var TileLayerService = /*#__PURE__*/function () {
     key: "isParentLoaded",
     value: function isParentLoaded(sourceTile) {
       var parentTile = sourceTile.parent;
+
       if (!parentTile) {
         return true;
       }
+
       var tile = this.getTile(parentTile === null || parentTile === void 0 ? void 0 : parentTile.key);
+
       if (tile !== null && tile !== void 0 && tile.isLoaded) {
         // 递归父级
         return true;
       }
+
       return false;
     }
   }, {
     key: "isChildrenLoaded",
     value: function isChildrenLoaded(sourceTile) {
       var _this = this;
+
       var childrenTile = sourceTile === null || sourceTile === void 0 ? void 0 : sourceTile.children;
+
       if (childrenTile.length === 0) {
         return true;
       }
+
       return childrenTile.some(function (tile) {
         var tileLayer = _this.getTile(tile === null || tile === void 0 ? void 0 : tile.key);
+
         return (tileLayer === null || tileLayer === void 0 ? void 0 : tileLayer.isLoaded) === false;
       });
     }
@@ -132,39 +148,49 @@ var TileLayerService = /*#__PURE__*/function () {
     value: function () {
       var _render = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var _this2 = this;
+
         var layers, renders;
         return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              layers = this.getRenderLayers();
-              renders = layers.map( /*#__PURE__*/function () {
-                var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer) {
-                  return _regenerator.default.wrap(function _callee$(_context) {
-                    while (1) switch (_context.prev = _context.next) {
-                      case 0:
-                        _context.next = 2;
-                        return _this2.layerService.renderTileLayer(layer);
-                      case 2:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }, _callee);
-                }));
-                return function (_x) {
-                  return _ref2.apply(this, arguments);
-                };
-              }());
-              _context2.next = 4;
-              return Promise.all(renders);
-            case 4:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                layers = this.getRenderLayers();
+                renders = layers.map( /*#__PURE__*/function () {
+                  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(layer) {
+                    return _regenerator.default.wrap(function _callee$(_context) {
+                      while (1) {
+                        switch (_context.prev = _context.next) {
+                          case 0:
+                            _context.next = 2;
+                            return _this2.layerService.renderTileLayer(layer);
+
+                          case 2:
+                          case "end":
+                            return _context.stop();
+                        }
+                      }
+                    }, _callee);
+                  }));
+
+                  return function (_x) {
+                    return _ref2.apply(this, arguments);
+                  };
+                }());
+                _context2.next = 4;
+                return Promise.all(renders);
+
+              case 4:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function render() {
         return _render.apply(this, arguments);
       }
+
       return render;
     }()
   }, {
@@ -207,4 +233,5 @@ var TileLayerService = /*#__PURE__*/function () {
   }]);
   return TileLayerService;
 }();
+
 exports.TileLayerService = TileLayerService;