@antv/l7-layers 2.15.2 → 2.15.4

package/lib/tile/manager/base.js

@@ -1,89 +1,65 @@
 "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;
     }()
   }, {
@@ -95,55 +71,48 @@ 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;
     }()
   }, {
@@ -163,7 +132,6 @@ 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));
     }
   }, {
@@ -182,11 +150,9 @@ 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();
     }
   }, {
@@ -195,7 +161,6 @@ var Base = /*#__PURE__*/function () {
       if (!tile) {
         return [];
       }
-
       return this.tileLayerCache.get(tile.key) || [];
     }
   }, {
@@ -220,7 +185,8 @@ 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,
@@ -241,11 +207,9 @@ 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);
@@ -258,16 +222,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();
       });
@@ -286,7 +250,6 @@ var Base = /*#__PURE__*/function () {
       if (tile.isLoad) {
         return true;
       }
-
       var isLoad = this.getLayers(tile).length === tile.loadedLayers;
       tile.isLoad = isLoad;
       return isLoad;
@@ -295,11 +258,9 @@ 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);
@@ -311,7 +272,6 @@ var Base = /*#__PURE__*/function () {
     key: "isTileParentLoaded",
     value: function isTileParentLoaded(tile) {
       var parent = tile.parent;
-
       if (!parent) {
         return true;
       } else {
@@ -335,5 +295,4 @@ var Base = /*#__PURE__*/function () {
   }]);
   return Base;
 }();
-
 exports.Base = Base;

package/lib/tile/service/TileLayerService.js

@@ -1,34 +1,26 @@
 "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", []);
@@ -36,7 +28,6 @@ var TileLayerService = /*#__PURE__*/function () {
     this.layerService = layerService;
     this.parent = parent;
   }
-
   (0, _createClass2.default)(TileLayerService, [{
     key: "tiles",
     get: function get() {
@@ -76,7 +67,6 @@ var TileLayerService = /*#__PURE__*/function () {
         return t.key === tileKey;
       });
       var tile = this.layerTiles.splice(index, 1);
-
       if (tile[0]) {
         tile[0].destroy();
       }
@@ -84,7 +74,8 @@ 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)
@@ -92,6 +83,7 @@ var TileLayerService = /*#__PURE__*/function () {
       //   } else {
       //     tile?.updateVisible(true);
       //   }
+
       // } else {
       //    // 可见 => 不可见 兄弟节点加载完成
       //    if(sourceTile.parent) {
@@ -108,34 +100,26 @@ 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;
       });
     }
@@ -144,48 +128,38 @@ 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);
-                  };
-                }());
-                Promise.all(renders);
-
-              case 3:
-              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);
+                };
+              }());
+              Promise.all(renders);
+            case 3:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function render() {
         return _render.apply(this, arguments);
       }
-
       return render;
     }()
   }, {
@@ -228,5 +202,4 @@ var TileLayerService = /*#__PURE__*/function () {
   }]);
   return TileLayerService;
 }();
-
 exports.TileLayerService = TileLayerService;

package/lib/tile/service/TilePickService.js

@@ -1,36 +1,25 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TilePickService = void 0;
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 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 _l7Utils = require("@antv/l7-utils");
-
 var _TileSourceService = require("./TileSourceService");
-
 var SELECT = 'select';
 var ACTIVE = 'active';
-
 var TilePickService = /*#__PURE__*/function () {
   function TilePickService(_ref) {
     var layerService = _ref.layerService,
-        tileLayerService = _ref.tileLayerService,
-        parent = _ref.parent;
+      tileLayerService = _ref.tileLayerService,
+      parent = _ref.parent;
     (0, _classCallCheck2.default)(this, TilePickService);
     (0, _defineProperty2.default)(this, "tilePickID", new Map());
     this.layerService = layerService;
@@ -38,13 +27,11 @@ var TilePickService = /*#__PURE__*/function () {
     this.parent = parent;
     this.tileSourceService = new _TileSourceService.TileSourceService();
   }
-
   (0, _createClass2.default)(TilePickService, [{
     key: "pickRender",
     value: function pickRender(target) {
       // 一个 TileLayer 有多个 Tile，但是会同时触发事件的只有一个 Tile
       var tile = this.tileLayerService.getVisibleTileBylngLat(target.lngLat);
-
       if (tile) {
         // TODO 多图层拾取
         var pickLayer = tile.getMainLayer();
@@ -56,18 +43,14 @@ var TilePickService = /*#__PURE__*/function () {
     value: function pick(layer, target) {
       var container = this.parent.getContainer();
       var pickingService = container.get(_l7Core.TYPES.IPickingService);
-
       if (layer.type === 'RasterLayer') {
         var tile = this.tileLayerService.getVisibleTileBylngLat(target.lngLat);
-
         if (tile && tile.getMainLayer() !== undefined) {
           var pickLayer = tile.getMainLayer();
           return pickLayer.layerPickService.pickRasterLayer(pickLayer, target, this.parent);
         }
-
         return false;
       }
-
       this.pickRender(target);
       return pickingService.pickFromPickingFBO(layer, target);
     }
@@ -76,10 +59,9 @@ var TilePickService = /*#__PURE__*/function () {
     value: function selectFeature(pickedColors) {
       // @ts-ignore
       var _pickedColors = (0, _slicedToArray2.default)(pickedColors, 3),
-          r = _pickedColors[0],
-          g = _pickedColors[1],
-          b = _pickedColors[2];
-
+        r = _pickedColors[0],
+        g = _pickedColors[1],
+        b = _pickedColors[2];
       var id = this.color2PickId(r, g, b);
       this.tilePickID.set(SELECT, id);
       this.updateHighLight(r, g, b, SELECT);
@@ -89,10 +71,9 @@ var TilePickService = /*#__PURE__*/function () {
     value: function highlightPickedFeature(pickedColors) {
       // @ts-ignore
       var _pickedColors2 = (0, _slicedToArray2.default)(pickedColors, 3),
-          r = _pickedColors2[0],
-          g = _pickedColors2[1],
-          b = _pickedColors2[2];
-
+        r = _pickedColors2[0],
+        g = _pickedColors2[1],
+        b = _pickedColors2[2];
       var id = this.color2PickId(r, g, b);
       this.tilePickID.set(ACTIVE, id);
       this.updateHighLight(r, g, b, ACTIVE);
@@ -102,12 +83,10 @@ var TilePickService = /*#__PURE__*/function () {
     value: function updateHighLight(r, g, b, type) {
       this.tileLayerService.tiles.map(function (tile) {
         var layer = tile.getMainLayer();
-
         switch (type) {
           case SELECT:
             layer === null || layer === void 0 ? void 0 : layer.hooks.beforeSelect.call([r, g, b]);
             break;
-
           case ACTIVE:
             layer === null || layer === void 0 ? void 0 : layer.hooks.beforeHighlight.call([r, g, b]);
             break;
@@ -119,25 +98,21 @@ var TilePickService = /*#__PURE__*/function () {
     value: function setPickState() {
       var selectColor = this.tilePickID.get(SELECT);
       var activeColor = this.tilePickID.get(ACTIVE);
-
       if (selectColor) {
         var _this$pickId2Color = this.pickId2Color(selectColor),
-            _this$pickId2Color2 = (0, _slicedToArray2.default)(_this$pickId2Color, 3),
-            r = _this$pickId2Color2[0],
-            g = _this$pickId2Color2[1],
-            b = _this$pickId2Color2[2];
-
+          _this$pickId2Color2 = (0, _slicedToArray2.default)(_this$pickId2Color, 3),
+          r = _this$pickId2Color2[0],
+          g = _this$pickId2Color2[1],
+          b = _this$pickId2Color2[2];
         this.updateHighLight(r, g, b, SELECT);
         return;
       }
-
       if (activeColor) {
         var _this$pickId2Color3 = this.pickId2Color(activeColor),
-            _this$pickId2Color4 = (0, _slicedToArray2.default)(_this$pickId2Color3, 3),
-            _r = _this$pickId2Color4[0],
-            _g = _this$pickId2Color4[1],
-            _b = _this$pickId2Color4[2];
-
+          _this$pickId2Color4 = (0, _slicedToArray2.default)(_this$pickId2Color3, 3),
+          _r = _this$pickId2Color4[0],
+          _g = _this$pickId2Color4[1],
+          _b = _this$pickId2Color4[2];
         this.updateHighLight(_r, _g, _b, ACTIVE);
         return;
       }
@@ -152,27 +127,31 @@ var TilePickService = /*#__PURE__*/function () {
     value: function pickId2Color(str) {
       return (0, _l7Utils.encodePickingColor)(str);
     }
-    /** 从瓦片中根据数据 */
 
+    /** 从瓦片中根据数据 */
   }, {
     key: "getFeatureById",
     value: function getFeatureById(pickedFeatureIdx) {
       // 提取当前可见瓦片
       var tiles = this.tileLayerService.getTiles().filter(function (tile) {
         return tile.visible;
-      }); // 提取当前可见瓦片中匹配 ID 的 feature 列表
-
+      });
+      // 提取当前可见瓦片中匹配 ID 的 feature 列表
       var features = [];
       tiles.forEach(function (tile) {
         features.push.apply(features, (0, _toConsumableArray2.default)(tile.getFeatureById(pickedFeatureIdx)));
-      }); // 将 feature 列表合并后返回
+      });
+
+      // 将 feature 列表合并后返回
       // 统一返回成 polygon 的格式 点、线、面可以通用
+
       // const data = this.tileSourceService.getCombineFeature(features);
 
       return features;
-    } // Tip: for interface define
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    }
 
+    // Tip: for interface define
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "pickRasterLayer",
     value: function pickRasterLayer(layer, target, parent) {
@@ -181,5 +160,4 @@ var TilePickService = /*#__PURE__*/function () {
   }]);
   return TilePickService;
 }();
-
 exports.TilePickService = TilePickService;