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

package/es/tile/manager/tileLayerManager.js

@@ -1,112 +1,47 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
+
+import { TileManager } from "./baseTileManager";
 import { generateColorRamp } from '@antv/l7-utils';
-import { getTileFactory } from "../tileFactory";
-import { getLayerShape, getMaskValue } from "../utils";
+import { getLayerShape, getMaskValue, updateLayersConfig } from "../utils";
 import TileConfigManager from "./tileConfigManager";
 import TilePickManager from "./tilePickerManager";
-export var TileLayerManager = /*#__PURE__*/function () {
+export var TileLayerManager = /*#__PURE__*/function (_TileManager) {
+  _inherits(TileLayerManager, _TileManager);
+
+  var _super = _createSuper(TileLayerManager);
+
   function TileLayerManager(parent, mapService, rendererService, pickingService, transforms) {
+    var _this;
+
     _classCallCheck(this, TileLayerManager);
 
-    this.parent = parent;
-    this.children = parent.layerChildren;
-    this.mapService = mapService;
-    this.rendererService = rendererService;
-    this.transforms = transforms;
-    this.tilePickManager = new TilePickManager(parent, rendererService, pickingService, this.children);
-    this.tileConfigManager = new TileConfigManager();
-    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 TilePickManager(parent, rendererService, pickingService, _this.children);
+    _this.tileConfigManager = new TileConfigManager();
 
-  _createClass(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(_defineProperty({}, 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, _toConsumableArray(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;
+  }
+
+  _createClass(TileLayerManager, [{
     key: "render",
     value: function render() {
       var _this$tileConfigManag, _this$tilePickManager;
@@ -122,8 +57,8 @@ export 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(),
@@ -175,12 +110,6 @@ export var TileLayerManager = /*#__PURE__*/function () {
 
       var parentParserType = source.getParserType();
       var layerShape = getLayerShape(this.parent.type, this.parent);
-
-      if (rampColors) {
-        // 构建统一的色带贴图
-        this.rampColorsData = generateColorRamp(rampColors);
-      }
-
       this.initOptions = {
         layerType: this.parent.type,
         transforms: this.transforms,
@@ -201,7 +130,6 @@ export var TileLayerManager = /*#__PURE__*/function () {
         clampHigh: clampHigh,
         domain: domain,
         rampColors: rampColors,
-        rampColorsData: this.rampColorsData,
         // worker
         workerEnabled: workerEnabled,
         pixelConstant: pixelConstant,
@@ -210,22 +138,24 @@ export 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 = 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
@@ -258,7 +188,7 @@ export var TileLayerManager = /*#__PURE__*/function () {
 
       this.tileConfigManager.on('updateConfig', function (updateConfigs) {
         updateConfigs.map(function (key) {
-          _this.updateStyle(key);
+          _this2.updateStyle(key);
 
           return '';
         });
@@ -267,7 +197,7 @@ export var TileLayerManager = /*#__PURE__*/function () {
   }, {
     key: "updateStyle",
     value: function updateStyle(style) {
-      var _this2 = this;
+      var _this3 = this;
 
       var updateValue = null;
 
@@ -282,7 +212,7 @@ export var TileLayerManager = /*#__PURE__*/function () {
 
         updateValue = scaleValue;
         this.children.map(function (child) {
-          _this2.tileFactory.setStyleAttributeField(child, style, scaleValue);
+          _this3.tileFactory.setStyleAttributeField(child, style, scaleValue);
 
           return '';
         });
@@ -296,10 +226,18 @@ export var TileLayerManager = /*#__PURE__*/function () {
 
         var config = layerConfig[style];
         updateValue = config;
-        this.updateLayersConfig(this.children, style, config);
+        updateLayersConfig(this.children, style, config);
 
         if (style === 'rampColors' && config) {
-          this.rampColorsData = generateColorRamp(config);
+          var createTexture2D = this.rendererService.createTexture2D;
+          var imageData = generateColorRamp(config);
+          this.initOptions.colorTexture = createTexture2D({
+            data: imageData.data,
+            width: imageData.width,
+            height: imageData.height,
+            flipY: false
+          });
+          updateLayersConfig(this.children, 'colorTexture', this.initOptions.colorTexture);
         }
       } // @ts-ignore
 
@@ -307,17 +245,11 @@ export var TileLayerManager = /*#__PURE__*/function () {
       this.initOptions[style] = updateValue;
     }
   }, {
-    key: "initTileFactory",
-    value: function initTileFactory() {
-      var source = this.parent.getSource();
-      var 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;
-}();
+}(TileManager);

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

@@ -17,4 +17,5 @@ export default class TilePickManager extends EventEmitter implements ITilePickMa
     beforeHighlight(pickedColors: any): void;
     beforeSelect(pickedColors: any): void;
     protected renderMask(layer: ILayer): void;
+    destroy(): void;
 }

package/es/tile/manager/tilePickerManager.js

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

package/es/tile/models/tileModel.d.ts

@@ -4,6 +4,7 @@ export default class TileModel extends BaseModel {
     getUninforms(): IModelUniform;
     private getTileLayer;
     initModels(): never[];
+    clearModels(): void;
     buildModels(): never[];
     protected registerBuiltinAttributes(): void;
 }

package/es/tile/models/tileModel.js

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

package/es/tile/tileFactory/rasterData.js

@@ -30,16 +30,15 @@ var RasterTiffTile = /*#__PURE__*/function (_TileFactory) {
   _createClass(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: [],
@@ -50,20 +49,19 @@ var RasterTiffTile = /*#__PURE__*/function (_TileFactory) {
       var layer = new RasterDataLayer({
         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);
       registerLayers(this.parentLayer, [layer]);

package/es/tile/tileFactory/rasterDataLayer.d.ts

@@ -1,6 +1,6 @@
 import BaseLayer from '../../core/BaseLayer';
 import { IRasterLayerStyleOptions } from '../../core/interface';
-import RasterModel from '../../raster/models/raster';
+import RasterModel from '../../raster/models/rasterTile';
 export default class RasterTiffLayer extends BaseLayer<Partial<IRasterLayerStyleOptions>> {
     type: string;
     buildModels(): void;

package/es/tile/tileFactory/rasterDataLayer.js

@@ -11,7 +11,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import BaseLayer from "../../core/BaseLayer";
-import RasterModel from "../../raster/models/raster";
+import RasterModel from "../../raster/models/rasterTile";
 
 var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(RasterTiffLayer, _BaseLayer);

package/es/tile/tileLayer/baseMapTileLayer.d.ts

@@ -26,4 +26,5 @@ export default class BaseTileLayer implements IBaseTileLayer {
     private bindTilesetEvent;
     viewchange: import("lodash").DebouncedFunc<() => void>;
     private getCurrentView;
+    destroy(): void;
 }

package/es/tile/tileLayer/baseMapTileLayer.js

@@ -180,6 +180,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/es/tile/tileLayer/baseTileLayer.d.ts

@@ -44,4 +44,5 @@ export default class BaseTileLayer implements ITileLayer {
     private bindTilesetEvent;
     viewchange: import("lodash").DebouncedFunc<() => void>;
     private getCurrentView;
+    destroy(): void;
 }

package/es/tile/tileLayer/baseTileLayer.js

@@ -99,7 +99,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) {//
@@ -363,6 +364,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) {// 将事件抛出，图层上可以监听使用
@@ -372,6 +374,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) {
         // 将事件抛出，图层上可以监听使用
@@ -401,6 +404,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/es/tile/tmsMapTileLayer.js

@@ -12,7 +12,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import BaseTileLayer from "./tileLayer/baseMapTileLayer";
-import { tileAllLoad } from "./utils";
+import { tileAllLoad, updateLayersConfig } from "./utils";
 export var TMSBaseMapTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
   _inherits(TMSBaseMapTileLayer, _BaseTileLayer);
 
@@ -108,7 +108,7 @@ export var TMSBaseMapTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
       var _this3 = this;
 
       this.emitTileVisibleEvent(tile, function () {
-        _this3.tileLayerManager.updateLayersConfig(layers, 'visible', tile.isVisible);
+        updateLayersConfig(layers, 'visible', tile.isVisible);
 
         _this3.layerService.reRender();
       });

package/es/tile/tmsTileLayer.js

@@ -12,7 +12,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 
 import BaseTileLayer from "./tileLayer/baseTileLayer";
-import { tileAllLoad } from "./utils";
+import { tileAllLoad, updateLayersConfig } from "./utils";
 export var TMSTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
   _inherits(TMSTileLayer, _BaseTileLayer);
 
@@ -112,7 +112,7 @@ export var TMSTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
       var _this3 = this;
 
       this.emitTileVisibleEvent(tile, function () {
-        _this3.tileLayerManager.updateLayersConfig(layers, 'visible', tile.isVisible);
+        updateLayersConfig(layers, 'visible', tile.isVisible);
 
         _this3.layerService.reRender();
       });

package/es/tile/utils.d.ts

@@ -15,3 +15,4 @@ export declare function isTileLoaded(tile: Tile): boolean;
 export declare function isTileChildLoaded(tile: Tile): boolean;
 export declare function isTileParentLoaded(tile: Tile): boolean;
 export declare function tileAllLoad(tile: Tile, callback: () => void): void;
+export declare function updateLayersConfig(layers: ILayer[], key: string, value: any): void;

package/es/tile/utils.js

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { createLayerContainer } from '@antv/l7-core';
 import { DOM } from '@antv/l7-utils';
@@ -158,4 +159,16 @@ export function tileAllLoad(tile, callback) {
       window.clearInterval(timer);
     }
   }, 36);
+}
+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));
+    }
+  });
 }

package/lib/Geometry/models/billboard.js

@@ -206,7 +206,6 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
         descriptor: {
           name: 'a_Extrude',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
@@ -218,21 +217,19 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
             return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
           }
         }
-      }); // point layer size;
-
+      });
       this.styleAttributeService.registerStyleAttribute({
         name: 'uv',
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
           buffer: {
-            // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[2], vertex[3]];
           }
         }

package/lib/Geometry/models/plane.js

@@ -316,10 +316,10 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
       var gridX1 = gridX + 1;
       var gridY1 = gridY + 1;
       var widthStep = imgWidth / gridX;
-      var heihgtStep = imgHeight / gridY;
+      var heightStep = imgHeight / gridY;
 
       for (var iy = 0; iy < gridY1; iy++) {
-        var imgIndexY = Math.floor(iy * heihgtStep);
+        var imgIndexY = Math.floor(iy * heightStep);
         var imgLen = imgIndexY * imgWidth;
 
         for (var ix = 0; ix < gridX1; ix++) {
@@ -421,7 +421,7 @@ var PlaneModel = /*#__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]];
           }
         }

package/lib/Geometry/models/sprite.js

@@ -67,8 +67,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
           _ref$spriteBottom = _ref.spriteBottom,
           spriteBottom = _ref$spriteBottom === void 0 ? -100000 : _ref$spriteBottom;
 
-      var updateZ = _this.spriteUpdate; // const bottomZ = -100000;
-
+      var updateZ = _this.spriteUpdate;
       var bottomZ = spriteBottom;
       var topZ = _this.spriteTop;
 
@@ -96,7 +95,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateModel", function () {
       // @ts-ignore
-      var attributes = _this.layer.createAttrubutes({
+      var attributes = _this.layer.createAttributes({
         triangulation: _this.planeGeometryUpdateTriangulation
       });