@antv/l7-layers 2.19.2 → 2.19.4

package/lib/tile/service/TileLayerService.js

@@ -74,30 +74,23 @@ var TileLayerService = /*#__PURE__*/function () {
     key: "updateTileVisible",
     value: function updateTileVisible(sourceTile) {
       var tile = this.getTile(sourceTile.key);
-      // if(sourceTile.isVisible) {
-      //   // 不可见 => 可见 兄弟节点加载完成
-      //   if(sourceTile.parent) {
-      //     const flag = this.isChildrenLoaded(sourceTile.parent)
-      //     tile?.updateVisible(flag);
-      //   } else {
-      //     tile?.updateVisible(true);
-      //   }
-
-      // } else {
-      //    // 可见 => 不可见 兄弟节点加载完成
-      //    if(sourceTile.parent) {
-      //     const flag = this.isChildrenLoaded(sourceTile.parent)
-      //     tile?.updateVisible(!flag);
-      //   } else {
-      //     tile?.updateVisible(false);
-      //   }
-      // }
-      tile === null || tile === void 0 ? void 0 : tile.updateVisible(sourceTile.isVisible);
-      // if (sourceTile.isVisible) {
-      //   tile?.updateVisible(sourceTile.isVisible);
-      // } else {
-      //   this.removeTile(sourceTile.key);
-      // }
+      if (sourceTile.isVisible) {
+        // 不可见 => 可见 兄弟节点加载完成
+        if (sourceTile.parent) {
+          var flag = this.isChildrenLoaded(sourceTile.parent);
+          tile === null || tile === void 0 ? void 0 : tile.updateVisible(flag);
+        } else {
+          tile === null || tile === void 0 ? void 0 : tile.updateVisible(true);
+        }
+      } else {
+        // 可见 => 不可见 兄弟节点加载完成
+        if (sourceTile.parent) {
+          var _flag = this.isChildrenLoaded(sourceTile.parent);
+          tile === null || tile === void 0 ? void 0 : tile.updateVisible(!_flag);
+        } else {
+          tile === null || tile === void 0 ? void 0 : tile.updateVisible(false);
+        }
+      }
     }
   }, {
     key: "isParentLoaded",
@@ -121,9 +114,12 @@ var TileLayerService = /*#__PURE__*/function () {
       if (childrenTile.length === 0) {
         return true;
       }
-      return childrenTile.some(function (tile) {
+      return childrenTile.every(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;
+        if (!tileLayer) {
+          return true;
+        }
+        return (tileLayer === null || tileLayer === void 0 ? void 0 : tileLayer.isLoaded) === true;
       });
     }
   }, {

package/lib/tile/{tileFactory → tile}/Tile.js

@@ -11,23 +11,35 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 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 _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 _l7Core = require("@antv/l7-core");
+var _eventemitter = require("eventemitter3");
 var _polygon = _interopRequireDefault(require("../../polygon"));
 var _util = require("./util");
-var Tile = /*#__PURE__*/function () {
+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 Tile = /*#__PURE__*/function (_EventEmitter) {
+  (0, _inherits2.default)(Tile, _EventEmitter);
+  var _super = _createSuper(Tile);
   function Tile(sourceTile, parent) {
+    var _this;
     (0, _classCallCheck2.default)(this, Tile);
-    (0, _defineProperty2.default)(this, "visible", true);
-    (0, _defineProperty2.default)(this, "layers", []);
-    (0, _defineProperty2.default)(this, "isLoaded", false);
-    (0, _defineProperty2.default)(this, "tileMaskLayers", []);
-    this.parent = parent;
-    this.sourceTile = sourceTile;
-    this.x = sourceTile.x;
-    this.y = sourceTile.y;
-    this.z = sourceTile.z;
-    this.key = "".concat(this.x, "_").concat(this.y, "_").concat(this.z);
+    _this = _super.call(this);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "visible", true);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "layers", []);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isLoaded", false);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "tileMaskLayers", []);
+    _this.parent = parent;
+    _this.sourceTile = sourceTile;
+    _this.x = sourceTile.x;
+    _this.y = sourceTile.y;
+    _this.z = sourceTile.z;
+    _this.key = "".concat(_this.x, "_").concat(_this.y, "_").concat(_this.z);
+    return _this;
   }
   (0, _createClass2.default)(Tile, [{
     key: "getLayers",
@@ -71,7 +83,7 @@ var Tile = /*#__PURE__*/function () {
   }, {
     key: "getMaskLayer",
     value: function getMaskLayer() {
-      var _this = this;
+      var _this2 = this;
       var _this$parent$getLayer = this.parent.getLayerConfig(),
         maskLayers = _this$parent$getLayer.maskLayers;
       var layers = [];
@@ -82,7 +94,7 @@ var Tile = /*#__PURE__*/function () {
           return layer;
         }
         var tileLayer = layer.tileLayer;
-        var tile = tileLayer.getTile(_this.sourceTile.key);
+        var tile = tileLayer.getTile(_this2.sourceTile.key);
         var l = tile === null || tile === void 0 ? void 0 : tile.getLayers()[0];
         if (l) {
           layers.push(l);
@@ -109,7 +121,9 @@ var Tile = /*#__PURE__*/function () {
                   type: 'geojson',
                   featureId: 'id'
                 }
-              }).shape('fill');
+              }).shape('fill').style({
+                opacity: 0.5
+              });
               container = (0, _l7Core.createLayerContainer)(this.parent.sceneContainer);
               mask.setContainer(container, this.parent.sceneContainer);
               _context.next = 5;
@@ -233,5 +247,5 @@ var Tile = /*#__PURE__*/function () {
     }
   }]);
   return Tile;
-}();
+}(_eventemitter.EventEmitter);
 exports.default = Tile;

package/lib/tile/{tileFactory → tile}/VectorTile.js

@@ -37,12 +37,13 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
               vectorLayer = (0, _util.getTileLayer)(this.parent.type);
               sourceOptions = this.getSourceOption();
               if (sourceOptions) {
-                _context.next = 7;
+                _context.next = 8;
                 break;
               }
               this.isLoaded = true;
+              this.emit('loaded');
               return _context.abrupt("return");
-            case 7:
+            case 8:
               layer = new vectorLayer((0, _objectSpread2.default)({}, layerOptions)).source(sourceOptions.data, sourceOptions.options); // 初始化数据映射
               Object.keys(attributes).forEach(function (type) {
                 var _attributes$attr, _attributes$attr2;
@@ -50,19 +51,20 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
                 // @ts-ignore
                 layer[attr]((_attributes$attr = attributes[attr]) === null || _attributes$attr === void 0 ? void 0 : _attributes$attr.field, (_attributes$attr2 = attributes[attr]) === null || _attributes$attr2 === void 0 ? void 0 : _attributes$attr2.values);
               });
-              _context.next = 11;
+              _context.next = 12;
               return this.addLayer(layer);
-            case 11:
+            case 12:
               if (!layerOptions.tileMask) {
-                _context.next = 14;
+                _context.next = 15;
                 break;
               }
-              _context.next = 14;
+              _context.next = 15;
               return this.addTileMask();
-            case 14:
+            case 15:
               this.setLayerMinMaxZoom(layer);
               this.isLoaded = true;
-            case 16:
+              this.emit('loaded');
+            case 18:
             case "end":
               return _context.stop();
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.19.2",
+  "version": "2.19.4",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-core": "2.19.2",
-    "@antv/l7-maps": "2.19.2",
-    "@antv/l7-source": "2.19.2",
-    "@antv/l7-utils": "2.19.2",
+    "@antv/l7-core": "2.19.4",
+    "@antv/l7-maps": "2.19.4",
+    "@antv/l7-source": "2.19.4",
+    "@antv/l7-utils": "2.19.4",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -52,7 +52,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.19.2",
+    "@antv/l7-test-utils": "2.19.4",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "bb4874bc2e888d843be4946a9990b0add4570fa1",
+  "gitHead": "6cfa2a8906a86d9e8c62ed4a2e17ba607009f34a",
   "publishConfig": {
     "access": "public"
   }

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

@@ -1,35 +0,0 @@
-import { ILayer, ILayerService, IMapService, IRendererService, ISubLayerInitOptions } from '@antv/l7-core';
-import { SourceTile } from '@antv/l7-utils';
-export declare class Base {
-    sourceLayer: string;
-    parent: ILayer;
-    children: ILayer[];
-    mapService: IMapService;
-    rendererService: IRendererService;
-    protected tileFactory: any;
-    protected initOptions: ISubLayerInitOptions;
-    private tileCache;
-    private tileLayerCache;
-    private initTileLayers;
-    render(): void;
-    hasTile(tile: SourceTile): boolean;
-    addTile(tile: SourceTile): Promise<any>;
-    removeTile(tile: SourceTile): void;
-    addChild(layer: ILayer): void;
-    addChildren(layers: ILayer[]): void;
-    removeLayers(layers?: ILayer[], refresh?: boolean): void;
-    removeChild(layer: ILayer): void;
-    getLayers(tile: SourceTile): ILayer[];
-    getChild(layerID: string): ILayer;
-    clearChild(): void;
-    hasChild(layer: ILayer): boolean;
-    initTileFactory(): void;
-    getSourceLayer(parentParserType: string, sourceLayer: string | undefined): string | undefined;
-    updateTileVisible(tile: SourceTile, layerService: ILayerService): void;
-    listenLoad(tile: SourceTile, callback: () => void): void;
-    isTileLoaded(tile: SourceTile): boolean;
-    isTileChildLoaded(tile: SourceTile): boolean;
-    isTileParentLoaded(tile: SourceTile): boolean;
-    isTileAllLoad(tile: SourceTile): boolean;
-    destroy(): void;
-}

package/es/tile/manager/base.js

@@ -1,290 +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 { createLayerContainer } from '@antv/l7-core';
-import { updateLayersConfig } from "../style/utils";
-export var Base = /*#__PURE__*/function () {
-  function Base() {
-    _classCallCheck(this, Base);
-    _defineProperty(this, "tileCache", new Map());
-    _defineProperty(this, "tileLayerCache", new Map());
-  }
-  _createClass(Base, [{
-    key: "initTileLayers",
-    value: function () {
-      var _initTileLayers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layers, tile) {
-        var _this = this;
-        return _regeneratorRuntime.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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
-                  var container;
-                  return _regeneratorRuntime.wrap(function _callee$(_context) {
-                    while (1) switch (_context.prev = _context.next) {
-                      case 0:
-                        container = 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;
-    }()
-  }, {
-    key: "render",
-    value: function render() {
-      this.parent.renderLayers();
-    }
-  }, {
-    key: "hasTile",
-    value: function hasTile(tile) {
-      return this.tileCache.has(tile.key);
-    }
-
-    // 添加图层
-  }, {
-    key: "addTile",
-    value: function () {
-      var _addTile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(tile) {
-        var layerCollections;
-        return _regeneratorRuntime.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();
-          }
-        }, _callee3, this);
-      }));
-      function addTile(_x4) {
-        return _addTile.apply(this, arguments);
-      }
-      return addTile;
-    }()
-  }, {
-    key: "removeTile",
-    value: function removeTile(tile) {
-      this.tileCache.delete(tile.key);
-      var layers = this.tileLayerCache.get(tile.key);
-      this.tileLayerCache.delete(tile.key);
-      this.removeLayers(layers, false);
-    }
-  }, {
-    key: "addChild",
-    value: function addChild(layer) {
-      this.children.push(layer);
-    }
-  }, {
-    key: "addChildren",
-    value: function addChildren(layers) {
-      var _this$children;
-      (_this$children = this.children).push.apply(_this$children, _toConsumableArray(layers));
-    }
-  }, {
-    key: "removeLayers",
-    value: function removeLayers() {
-      var layers = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-      var refresh = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      this.children = this.children.filter(function (child) {
-        return !layers.includes(child);
-      });
-      layers.map(function (layer) {
-        return layer.destroy(refresh);
-      });
-    }
-  }, {
-    key: "removeChild",
-    value: function removeChild(layer) {
-      var layerIndex = this.children.indexOf(layer);
-      if (layerIndex > -1) {
-        this.children.splice(layerIndex, 1);
-      }
-      layer.destroy();
-    }
-  }, {
-    key: "getLayers",
-    value: function getLayers(tile) {
-      if (!tile) {
-        return [];
-      }
-      return this.tileLayerCache.get(tile.key) || [];
-    }
-  }, {
-    key: "getChild",
-    value: function getChild(layerID) {
-      return this.children.filter(function (child) {
-        return child.id === layerID;
-      })[0];
-    }
-  }, {
-    key: "clearChild",
-    value: function clearChild() {
-      this.children.forEach(function (layer) {
-        layer.destroy();
-      });
-      this.children.slice(0, this.children.length);
-    }
-  }, {
-    key: "hasChild",
-    value: function hasChild(layer) {
-      return this.children.includes(layer);
-    }
-  }, {
-    key: "initTileFactory",
-    value: function initTileFactory() {
-      // this.tileFactory = new TileFactory({
-      //   parent: this.parent,
-      //   mapService: this.mapService,
-      //   rendererService: this.rendererService,
-      // });
-    }
-  }, {
-    key: "getSourceLayer",
-    value: function getSourceLayer(parentParserType, sourceLayer) {
-      if (parentParserType === 'geojsonvt') {
-        return 'geojsonvt';
-      } else if (parentParserType === 'testTile') {
-        return 'testTile';
-      } else {
-        return sourceLayer;
-      }
-    }
-  }, {
-    key: "updateTileVisible",
-    value: function updateTileVisible(tile, layerService) {
-      var layers = this.getLayers(tile);
-      if (layers.length === 0) {
-        return;
-      }
-      if (tile.isVisible) {
-        // 如果可见直接进行渲染，父级发
-        updateLayersConfig(layers, 'visible', tile.isVisible);
-      } else {
-        // 如果不可见，放大，等到子瓦片渲染完成，缩小：父级渲染成功
-        // console.log('updateTileVisible',`${tile.x}_${tile.y}_${tile.z}`,tile.isVisible)
-        // console.log(tile);
-        // console.log(`子瓦片${tile.x}/${tile.y}/${tile.z}`,tile.children.length)
-        // tile.children.forEach((t)=>{
-        //   console.log(`${t.x}/${t.y}/${t.z}`)
-        // })
-        updateLayersConfig(layers, 'visible', tile.isVisible);
-      }
-
-      // 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();
-      });
-      tile.children.map(function (childTile) {
-        childTile.once('layerLoaded', function () {
-          callback();
-        });
-      });
-      (_tile$parent = tile.parent) === null || _tile$parent === void 0 ? void 0 : _tile$parent.once('layerLoaded', function () {
-        callback();
-      });
-    }
-  }, {
-    key: "isTileLoaded",
-    value: function isTileLoaded(tile) {
-      if (tile.isLoad) {
-        return true;
-      }
-      var isLoad = this.getLayers(tile).length === tile.loadedLayers;
-      tile.isLoad = isLoad;
-      return isLoad;
-    }
-  }, {
-    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);
-      }).length === children.length;
-      tile.isChildLoad = isLoad;
-      return isLoad;
-    }
-  }, {
-    key: "isTileParentLoaded",
-    value: function isTileParentLoaded(tile) {
-      var parent = tile.parent;
-      if (!parent) {
-        return true;
-      } else {
-        return this.isTileLoaded(parent);
-      }
-    }
-  }, {
-    key: "isTileAllLoad",
-    value: function isTileAllLoad(tile) {
-      var tileLoaded = this.isTileLoaded(tile);
-      var tileChildLoaded = this.isTileChildLoaded(tile);
-      var tileParentLoaded = this.isTileParentLoaded(tile);
-      return tileLoaded && tileChildLoaded && tileParentLoaded;
-    }
-  }, {
-    key: "destroy",
-    value: function destroy() {
-      this.tileCache.clear();
-      this.tileLayerCache.clear();
-    }
-  }]);
-  return Base;
-}();

package/es/tile/style/utils.d.ts

@@ -1,2 +0,0 @@
-import { ILayer } from '@antv/l7-core';
-export declare function updateLayersConfig(layers: ILayer[], key: string, value: any): void;

package/es/tile/style/utils.js

@@ -1,13 +0,0 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-export function updateLayersConfig(layers, key, value) {
-  layers.map(function (layer) {
-    if (key === 'mask') {
-      // Tip: 栅格瓦片生效、设置全局的 mask、瓦片被全局的 mask 影响
-      layer.style({
-        mask: value
-      });
-    } else {
-      layer.updateLayerConfig(_defineProperty({}, key, value));
-    }
-  });
-}