@antv/l7-layers 2.9.27-alpha.4 → 2.9.27

package/lib/tile/manager/tileLayerManager.js

@@ -7,17 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TileLayerManager = void 0;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
-var _l7Utils = require("@antv/l7-utils");
+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 _tileFactory = require("../tileFactory");
+var _baseTileManager = require("./baseTileManager");
+
+var _l7Utils = require("@antv/l7-utils");
 
 var _utils = require("../utils");
 
@@ -25,105 +27,38 @@ var _tileConfigManager = _interopRequireDefault(require("./tileConfigManager"));
 
 var _tilePickerManager = _interopRequireDefault(require("./tilePickerManager"));
 
-var TileLayerManager = /*#__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 TileLayerManager = /*#__PURE__*/function (_TileManager) {
+  (0, _inherits2.default)(TileLayerManager, _TileManager);
+
+  var _super = _createSuper(TileLayerManager);
+
   function TileLayerManager(parent, mapService, rendererService, pickingService, transforms) {
+    var _this;
+
     (0, _classCallCheck2.default)(this, TileLayerManager);
-    this.parent = parent;
-    this.children = parent.layerChildren;
-    this.mapService = mapService;
-    this.rendererService = rendererService;
-    this.transforms = transforms;
-    this.tilePickManager = new _tilePickerManager.default(parent, rendererService, pickingService, this.children);
-    this.tileConfigManager = new _tileConfigManager.default();
-    this.setSubLayerInitOptipn();
-    this.setConfigListener();
-    this.initTileFactory();
-  }
+    _this = _super.call(this);
+    _this.parent = parent;
+    _this.children = parent.layerChildren;
+    _this.mapService = mapService;
+    _this.rendererService = rendererService;
+    _this.transforms = transforms;
+    _this.tilePickManager = new _tilePickerManager.default(parent, rendererService, pickingService, _this.children);
+    _this.tileConfigManager = new _tileConfigManager.default();
 
-  (0, _createClass2.default)(TileLayerManager, [{
-    key: "createTile",
-    value: function createTile(tile) {
-      return this.tileFactory.createTile(tile, this.initOptions);
-    }
-  }, {
-    key: "updateLayersConfig",
-    value: function updateLayersConfig(layers, key, value) {
-      layers.map(function (layer) {
-        if (key === 'mask') {
-          // Tip: 栅格瓦片生效、设置全局的 mask、瓦片被全局的 mask 影响
-          layer.style({
-            mask: value
-          });
-        } else {
-          layer.updateLayerConfig((0, _defineProperty2.default)({}, key, value));
-        }
-      });
-    }
-  }, {
-    key: "addChild",
-    value: function addChild(layer) {
-      this.children.push(layer);
-    }
-  }, {
-    key: "addChilds",
-    value: function addChilds(layers) {
-      var _this$children;
+    _this.setSubLayerInitOption();
 
-      (_this$children = this.children).push.apply(_this$children, (0, _toConsumableArray2.default)(layers));
-    }
-  }, {
-    key: "removeChilds",
-    value: function removeChilds(layerIDList) {
-      var refresh = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      var remveLayerList = [];
-      var cacheLayerList = [];
-      this.children.filter(function (child) {
-        layerIDList.includes(child.id) ? remveLayerList.push(child) : cacheLayerList.push(child);
-      });
-      remveLayerList.map(function (layer) {
-        return layer.destroy(refresh);
-      });
-      this.children = cacheLayerList;
-    }
-  }, {
-    key: "removeChild",
-    value: function removeChild(layer) {
-      var layerIndex = this.children.indexOf(layer);
+    _this.setConfigListener();
 
-      if (layerIndex > -1) {
-        this.children.splice(layerIndex, 1);
-      }
+    _this.initTileFactory();
 
-      layer.destroy();
-    }
-  }, {
-    key: "getChilds",
-    value: function getChilds(layerIDList) {
-      return this.children.filter(function (child) {
-        return layerIDList.includes(child.id);
-      });
-    }
-  }, {
-    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);
-    }
-  }, {
+    return _this;
+  }
+
+  (0, _createClass2.default)(TileLayerManager, [{
     key: "render",
     value: function render() {
       var _this$tileConfigManag, _this$tilePickManager;
@@ -139,8 +74,8 @@ var TileLayerManager = /*#__PURE__*/function () {
       return (_this$tilePickManager2 = this.tilePickManager) === null || _this$tilePickManager2 === void 0 ? void 0 : _this$tilePickManager2.pickRender(this.children, target);
     }
   }, {
-    key: "setSubLayerInitOptipn",
-    value: function setSubLayerInitOptipn() {
+    key: "setSubLayerInitOption",
+    value: function setSubLayerInitOption() {
       var _source$data;
 
       var _ref = this.parent.getLayerConfig(),
@@ -192,21 +127,6 @@ var TileLayerManager = /*#__PURE__*/function () {
 
       var parentParserType = source.getParserType();
       var layerShape = (0, _utils.getLayerShape)(this.parent.type, this.parent);
-      var colorTexture = undefined;
-
-      if (rampColors) {
-        // 构建统一的色带贴图
-        var createTexture2D = this.rendererService.createTexture2D;
-        this.rampColorsData = (0, _l7Utils.generateColorRamp)(rampColors);
-        var imageData = (0, _l7Utils.generateColorRamp)(rampColors);
-        colorTexture = createTexture2D({
-          data: this.rampColorsData.data,
-          width: imageData.width,
-          height: imageData.height,
-          flipY: false
-        });
-      }
-
       this.initOptions = {
         layerType: this.parent.type,
         transforms: this.transforms,
@@ -227,8 +147,6 @@ var TileLayerManager = /*#__PURE__*/function () {
         clampHigh: clampHigh,
         domain: domain,
         rampColors: rampColors,
-        rampColorsData: this.rampColorsData,
-        colorTexture: colorTexture,
         // worker
         workerEnabled: workerEnabled,
         pixelConstant: pixelConstant,
@@ -237,22 +155,24 @@ var TileLayerManager = /*#__PURE__*/function () {
         pixelConstantB: pixelConstantB,
         pixelConstantRGB: pixelConstantRGB
       };
-    }
-  }, {
-    key: "getSourceLayer",
-    value: function getSourceLayer(parentParserType, sourceLayer) {
-      if (parentParserType === 'geojsonvt') {
-        return 'geojsonvt';
-      } else if (parentParserType === 'testTile') {
-        return 'testTile';
-      } else {
-        return sourceLayer;
+
+      if (rampColors) {
+        // 构建统一的色带贴图
+        var createTexture2D = this.rendererService.createTexture2D;
+        var imageData = (0, _l7Utils.generateColorRamp)(rampColors);
+        var colorTexture = createTexture2D({
+          data: imageData.data,
+          width: imageData.width,
+          height: imageData.height,
+          flipY: false
+        });
+        this.initOptions.colorTexture = colorTexture;
       }
     }
   }, {
     key: "setConfigListener",
     value: function setConfigListener() {
-      var _this = this;
+      var _this2 = this;
 
       // RasterLayer PolygonLayer LineLayer PointLayer
       // All Tile Layer Need Listen
@@ -285,7 +205,7 @@ var TileLayerManager = /*#__PURE__*/function () {
 
       this.tileConfigManager.on('updateConfig', function (updateConfigs) {
         updateConfigs.map(function (key) {
-          _this.updateStyle(key);
+          _this2.updateStyle(key);
 
           return '';
         });
@@ -294,7 +214,7 @@ var TileLayerManager = /*#__PURE__*/function () {
   }, {
     key: "updateStyle",
     value: function updateStyle(style) {
-      var _this2 = this;
+      var _this3 = this;
 
       var updateValue = null;
 
@@ -309,7 +229,7 @@ var TileLayerManager = /*#__PURE__*/function () {
 
         updateValue = scaleValue;
         this.children.map(function (child) {
-          _this2.tileFactory.setStyleAttributeField(child, style, scaleValue);
+          _this3.tileFactory.setStyleAttributeField(child, style, scaleValue);
 
           return '';
         });
@@ -323,10 +243,18 @@ var TileLayerManager = /*#__PURE__*/function () {
 
         var config = layerConfig[style];
         updateValue = config;
-        this.updateLayersConfig(this.children, style, config);
+        (0, _utils.updateLayersConfig)(this.children, style, config);
 
         if (style === 'rampColors' && config) {
-          this.rampColorsData = (0, _l7Utils.generateColorRamp)(config);
+          var createTexture2D = this.rendererService.createTexture2D;
+          var imageData = (0, _l7Utils.generateColorRamp)(config);
+          this.initOptions.colorTexture = createTexture2D({
+            data: imageData.data,
+            width: imageData.width,
+            height: imageData.height,
+            flipY: false
+          });
+          (0, _utils.updateLayersConfig)(this.children, 'colorTexture', this.initOptions.colorTexture);
         }
       } // @ts-ignore
 
@@ -334,18 +262,12 @@ var TileLayerManager = /*#__PURE__*/function () {
       this.initOptions[style] = updateValue;
     }
   }, {
-    key: "initTileFactory",
-    value: function initTileFactory() {
-      var source = this.parent.getSource();
-      var TileFactory = (0, _tileFactory.getTileFactory)(this.parent.type, source.parser);
-      this.tileFactory = new TileFactory({
-        parent: this.parent,
-        mapService: this.mapService,
-        rendererService: this.rendererService
-      });
+    key: "destroy",
+    value: function destroy() {
+      this.tilePickManager.destroy();
     }
   }]);
   return TileLayerManager;
-}();
+}(_baseTileManager.TileManager);
 
 exports.TileLayerManager = TileLayerManager;

package/lib/tile/manager/tilePickerManager.js

@@ -193,6 +193,11 @@ var TilePickManager = /*#__PURE__*/function (_EventEmitter) {
         layer.hooks.afterRender.call();
       }
     }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      this.removeAllListeners();
+    }
   }]);
   return TilePickManager;
 }(_eventemitter.EventEmitter);

package/lib/tile/models/tileModel.js

@@ -75,6 +75,9 @@ var TileModel = /*#__PURE__*/function (_BaseModel) {
 
       return this.buildModels();
     }
+  }, {
+    key: "clearModels",
+    value: function clearModels() {}
   }, {
     key: "buildModels",
     value: function buildModels() {

package/lib/tile/tileFactory/rasterData.js

@@ -44,16 +44,15 @@ var RasterTiffTile = /*#__PURE__*/function (_TileFactory) {
   (0, _createClass2.default)(RasterTiffTile, [{
     key: "createTile",
     value: function createTile(tile, initOptions) {
-      var opacity = initOptions.opacity,
+      var colorTexture = initOptions.colorTexture,
+          opacity = initOptions.opacity,
           domain = initOptions.domain,
           clampHigh = initOptions.clampHigh,
           clampLow = initOptions.clampLow,
-          rampColors = initOptions.rampColors,
-          rampColorsData = initOptions.rampColorsData,
           mask = initOptions.mask;
-      var rasterdata = tile.data;
+      var rasterData = tile.data;
 
-      if (!rasterdata.data) {
+      if (!rasterData.data) {
         console.warn('raster data not exist!');
         return {
           layers: [],
@@ -64,20 +63,19 @@ var RasterTiffTile = /*#__PURE__*/function (_TileFactory) {
       var layer = new _rasterDataLayer.default({
         visible: tile.isVisible,
         mask: mask
-      }).source(rasterdata.data, {
+      }).source(rasterData.data, {
         parser: {
           type: 'raster',
-          width: rasterdata.width,
-          height: rasterdata.height,
+          width: rasterData.width,
+          height: rasterData.height,
           extent: tile.bboxPolygon.bbox
         }
       }).style({
+        colorTexture: colorTexture,
         opacity: opacity,
         domain: domain,
         clampHigh: clampHigh,
-        clampLow: clampLow,
-        rampColors: rampColors,
-        rampColorsData: rampColorsData
+        clampLow: clampLow
       });
       this.emitEvent([layer], false);
       (0, _utils.registerLayers)(this.parentLayer, [layer]);

package/lib/tile/tileFactory/rasterDataLayer.js

@@ -23,7 +23,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _BaseLayer2 = _interopRequireDefault(require("../../core/BaseLayer"));
 
-var _raster = _interopRequireDefault(require("../../raster/models/raster"));
+var _rasterTile = _interopRequireDefault(require("../../raster/models/rasterTile"));
 
 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); }; }
 
@@ -77,7 +77,7 @@ var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
   }, {
     key: "getModelType",
     value: function getModelType() {
-      return _raster.default;
+      return _rasterTile.default;
     }
   }, {
     key: "getConfigSchema",

package/lib/tile/tileLayer/baseMapTileLayer.js

@@ -188,6 +188,13 @@ var BaseTileLayer = /*#__PURE__*/function () {
         zoom: zoom
       };
     }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      var _this$tilesetManager3;
+
+      (_this$tilesetManager3 = this.tilesetManager) === null || _this$tilesetManager3 === void 0 ? void 0 : _this$tilesetManager3.destroy();
+    }
   }]);
   return BaseTileLayer;
 }();

package/lib/tile/tileLayer/baseTileLayer.js

@@ -109,7 +109,8 @@ var BaseTileLayer = /*#__PURE__*/function () {
     key: "pickLayers",
     value: function pickLayers(target) {
       return this.tileLayerManager.pickLayers(target);
-    }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   }, {
     key: "tileLoaded",
     value: function tileLoaded(tile) {//
@@ -373,6 +374,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
       if (!this.tilesetManager) {
         return;
       } // 瓦片数据加载成功
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
 
       this.tilesetManager.on('tile-loaded', function (tile) {// 将事件抛出，图层上可以监听使用
@@ -382,6 +384,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
         // 将事件抛出，图层上可以监听使用
         _this6.tileUnLoad(tile);
       }); // 瓦片数据加载失败
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
 
       this.tilesetManager.on('tile-error', function (error, tile) {
         // 将事件抛出，图层上可以监听使用
@@ -411,6 +414,14 @@ var BaseTileLayer = /*#__PURE__*/function () {
         zoom: zoom
       };
     }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      var _this$tilesetManager3;
+
+      (_this$tilesetManager3 = this.tilesetManager) === null || _this$tilesetManager3 === void 0 ? void 0 : _this$tilesetManager3.destroy();
+      this.tileLayerManager.destroy();
+    }
   }]);
   return BaseTileLayer;
 }();

package/lib/tile/tmsMapTileLayer.js

@@ -124,7 +124,7 @@ var TMSBaseMapTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
       var _this3 = this;
 
       this.emitTileVisibleEvent(tile, function () {
-        _this3.tileLayerManager.updateLayersConfig(layers, 'visible', tile.isVisible);
+        (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
 
         _this3.layerService.reRender();
       });

package/lib/tile/tmsTileLayer.js

@@ -128,7 +128,7 @@ var TMSTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
       var _this3 = this;
 
       this.emitTileVisibleEvent(tile, function () {
-        _this3.tileLayerManager.updateLayersConfig(layers, 'visible', tile.isVisible);
+        (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
 
         _this3.layerService.reRender();
       });

package/lib/tile/utils.js

@@ -17,6 +17,9 @@ exports.readRasterValue = readRasterValue;
 exports.registerLayers = registerLayers;
 exports.tileAllLoad = tileAllLoad;
 exports.tileVectorParser = void 0;
+exports.updateLayersConfig = updateLayersConfig;
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
@@ -193,4 +196,17 @@ function tileAllLoad(tile, callback) {
       window.clearInterval(timer);
     }
   }, 36);
+}
+
+function updateLayersConfig(layers, key, value) {
+  layers.map(function (layer) {
+    if (key === 'mask') {
+      // Tip: 栅格瓦片生效、设置全局的 mask、瓦片被全局的 mask 影响
+      layer.style({
+        mask: value
+      });
+    } else {
+      layer.updateLayerConfig((0, _defineProperty2.default)({}, key, value));
+    }
+  });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.27-alpha.4",
+  "version": "2.9.27",
   "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.2",
-    "@antv/l7-core": "2.9.27-alpha.4",
-    "@antv/l7-maps": "2.9.27-alpha.4",
-    "@antv/l7-source": "2.9.27-alpha.4",
-    "@antv/l7-utils": "2.9.27-alpha.4",
+    "@antv/l7-core": "2.9.27",
+    "@antv/l7-maps": "2.9.27",
+    "@antv/l7-source": "2.9.27",
+    "@antv/l7-utils": "2.9.27",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "9e77012376360246d49d7b5392eecd16b43b9109",
+  "gitHead": "fe24bbe041becf325b1dfd36258c11662a8d22f4",
   "publishConfig": {
     "access": "public"
   }