@antv/l7-layers 2.13.6 → 2.13.8

package/es/tile/tileFactory/RasterTile.js

@@ -13,9 +13,9 @@ 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 { getDefaultDomain } from '@antv/l7-utils';
 import RasterLayer from "../../raster";
 import Tile from "./Tile";
-import { getDefaultDomain } from '@antv/l7-utils';
 var DEFAULT_COLOR_TEXTURE_OPTION = {
   positions: [0, 1],
   colors: ['#000', '#fff']
@@ -50,6 +50,7 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
                 layer = new RasterLayer(_objectSpread(_objectSpread({}, layerOptions), {}, {
                   colorTexture: this.colorTexture
                 })).source(sourceOptions.data, sourceOptions.options); // 初始化数据映射
+                // tslint:disable-next-line: no-unused-expression
 
                 attributes && Object.keys(attributes).forEach(function (type) {
                   var _attributes$attr, _attributes$attr2;
@@ -100,7 +101,7 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
     }
     /**
      * 用于 style 更新 colorTexture 的优化
-     * @param arg 
+     * @param arg
      */
 
   }, {

package/es/tile/tileFactory/Tile.js

@@ -34,7 +34,9 @@ var Tile = /*#__PURE__*/function () {
 
   }, {
     key: "styleUpdate",
-    value: function styleUpdate() {}
+    value: function styleUpdate() {
+      return;
+    }
   }, {
     key: "lnglatInBounds",
     value: function lnglatInBounds(lnglat) {
@@ -148,8 +150,8 @@ var Tile = /*#__PURE__*/function () {
     }
     /**
      * 在一个 Tile 中可能存在一个相同 ID 的 feature
-     * @param id 
-     * @returns 
+     * @param id
+     * @returns
      */
 
   }, {

package/es/tile/tileFactory/VectorTile.js

@@ -186,7 +186,6 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
         return [];
       }
 
-      console.log(layer.getSource().data.dataArray, id);
       var res = layer.getSource().data.dataArray.filter(function (d) {
         return d._id === id;
       });

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

@@ -1,12 +1,12 @@
 import { ILayer } from '@antv/l7-core';
-import VectorTile from './VectorTile';
 import DebugTile from './DebugTile';
 import ImageTile from './ImageTile';
-import RasterTile from './RasterTile';
+import MaskLayer from './MaskTile';
 import RasterRGBTile from './RasterRGBTile';
 import RasterTerrainRGBTile from './RasterTerrainRGBTile';
-import MaskLayer from './MaskTile';
+import RasterTile from './RasterTile';
+import VectorTile from './VectorTile';
 export type TileType = 'VectorTile' | 'DebugTile' | 'PolygonLayer' | 'PointLayer' | 'LineLayer' | 'RasterLayer' | 'image' | 'MaskLayer' | 'TileDebugLayer';
-export declare function getTileFactory(layer: ILayer): typeof VectorTile | typeof DebugTile | typeof ImageTile | typeof RasterTile | typeof RasterRGBTile | typeof RasterTerrainRGBTile | typeof MaskLayer;
+export declare function getTileFactory(layer: ILayer): typeof DebugTile | typeof ImageTile | typeof MaskLayer | typeof RasterRGBTile | typeof RasterTerrainRGBTile | typeof RasterTile | typeof VectorTile;
 export * from '../interface';
 export * from './Tile';

package/es/tile/tileFactory/index.js

@@ -1,10 +1,10 @@
-import VectorTile from "./VectorTile";
 import DebugTile from "./DebugTile";
 import ImageTile from "./ImageTile";
-import RasterTile from "./RasterTile";
+import MaskLayer from "./MaskTile";
 import RasterRGBTile from "./RasterRGBTile";
 import RasterTerrainRGBTile from "./RasterTerrainRGBTile";
-import MaskLayer from "./MaskTile";
+import RasterTile from "./RasterTile";
+import VectorTile from "./VectorTile";
 export function getTileFactory(layer) {
   var tileType = layer.type;
 
@@ -36,7 +36,7 @@ export function getTileFactory(layer) {
         case 'customArrayBuffer':
           return RasterTile;
 
-        case "terrainRGB":
+        case 'terrainRGB':
           return RasterTerrainRGBTile;
 
         default:

package/es/tile/tileFactory/layers/TileDebugLayer.js

@@ -54,6 +54,9 @@ var TileDebugLayer = /*#__PURE__*/function (_BaseLayer) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                return _context.abrupt("return");
+
+              case 1:
               case "end":
                 return _context.stop();
             }

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

@@ -1,5 +1,5 @@
-import PointLayer from '../../point/index';
 import LineLayer from '../../line';
+import PointLayer from '../../point/index';
 import PolygonLayer from '../../polygon';
 export declare function getTileLayer(type: string): typeof LineLayer | typeof PointLayer | typeof PolygonLayer;
 export declare function isNeedMask(type: string): boolean;

package/es/tile/tileFactory/util.js

@@ -1,5 +1,5 @@
-import PointLayer from "../../point/index";
 import LineLayer from "../../line";
+import PointLayer from "../../point/index";
 import PolygonLayer from "../../polygon";
 export function getTileLayer(type) {
   if (type === 'PolygonLayer') {

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

@@ -1,4 +1,4 @@
-import { ILayer, IMapService, ILayerService, IRendererService, IPickingService, IInteractionTarget } from '@antv/l7-core';
+import { IInteractionTarget, ILayer, ILayerService, IMapService, IPickingService, IRendererService } from '@antv/l7-core';
 import { SourceTile, TilesetManager } from '@antv/l7-utils';
 import { TileLayerService } from '../service/TileLayerService';
 import { TilePickService } from '../service/TilePickService';

package/es/tile/tileLayer/BaseLayer.js

@@ -4,11 +4,11 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { TYPES } from '@antv/l7-core';
+import { debounce } from 'lodash';
 import { TileLayerService } from "../service/TileLayerService";
 import { TilePickService } from "../service/TilePickService";
-import { debounce } from 'lodash';
-import { getTileFactory } from "../tileFactory";
 import { ProxyFuncs } from "../style/constants";
+import { getTileFactory } from "../tileFactory";
 
 var BaseTileLayer = /*#__PURE__*/function () {
   // 瓦片数据管理器
@@ -287,7 +287,9 @@ var BaseTileLayer = /*#__PURE__*/function () {
 
   }, {
     key: "setPickState",
-    value: function setPickState(layers) {}
+    value: function setPickState(layers) {
+      return;
+    }
   }, {
     key: "pickRender",
     value: function pickRender(target) {
@@ -305,7 +307,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
     }
     /**
      * 实现 TileLayer 对子图层方法的代理
-     * @param parent 
+     * @param parent
      */
 
   }, {

package/es/wind/models/wind.js

@@ -188,13 +188,9 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.next = 2;
-                return this.initModels();
+                return _context2.abrupt("return", this.initModels());
 
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context2.stop();
             }

package/lib/Geometry/models/billboard.js

@@ -178,13 +178,9 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.next = 2;
-                return this.initModels();
+                return _context2.abrupt("return", this.initModels());
 
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context2.stop();
             }

package/lib/Geometry/models/plane.js

@@ -256,13 +256,9 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.next = 2;
-                return this.initModels();
+                return _context2.abrupt("return", this.initModels());
 
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context2.stop();
             }

package/lib/Geometry/models/sprite.js

@@ -279,13 +279,9 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.next = 2;
-                return this.initModels();
+                return _context2.abrupt("return", this.initModels());
 
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context2.stop();
             }

package/lib/citybuliding/models/build.js

@@ -122,13 +122,9 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.calCityGeo();
                 this.startModelAnimate();
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/lib/core/BaseLayer.js

@@ -382,23 +382,22 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     }()
   }, {
     key: "log",
-    value: function log(logType, time) {
+    value: function log(logType) {
+      var _this$debugService;
+
+      var step = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'init';
+
       // @ts-ignore 瓦片、瓦片图层目前不参与日志
       if (this.tileLayer || this.isTileLayer) {
         return;
       }
 
-      var key = "".concat(this.id, ".").concat(logType);
+      var key = "".concat(this.id, ".").concat(step, ".").concat(logType);
       var values = {
         id: this.id,
         type: this.type
       };
-
-      if (time) {
-        values.time = time;
-      }
-
-      this.debugService.log(key, values);
+      (_this$debugService = this.debugService) === null || _this$debugService === void 0 ? void 0 : _this$debugService.log(key, values);
     }
   }, {
     key: "updateModelData",
@@ -560,9 +559,13 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       var _this4 = this;
 
       if (this.inited) {
+        this.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.UPDATE);
         this.layerSource.setData(data, options);
+        this.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.UPDATE);
       } else {
         this.on('inited', function () {
+          _this4.log(_l7Core.IDebugLog.SourceInitStart, _l7Core.ILayerStage.UPDATE);
+
           var currentSource = _this4.getSource();
 
           if (!currentSource) {
@@ -571,6 +574,10 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
           } else {
             _this4.layerSource.setData(data, options);
           }
+
+          _this4.layerSource.once('update', function () {
+            _this4.log(_l7Core.IDebugLog.SourceInitEnd, _l7Core.ILayerStage.UPDATE);
+          });
         });
       }
 
@@ -1002,7 +1009,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "destroy",
     value: function destroy() {
-      var _this$multiPassRender, _this$layerModel2, _this$tileLayer;
+      var _this$multiPassRender, _this$layerModel2, _this$tileLayer, _this$debugService2;
 
       var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
 
@@ -1034,7 +1041,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       (_this$tileLayer = this.tileLayer) === null || _this$tileLayer === void 0 ? void 0 : _this$tileLayer.destroy();
       this.models = []; // 清除图层日志（如果有的话：非瓦片相关）
 
-      this.debugService.removeLog(this.id);
+      (_this$debugService2 = this.debugService) === null || _this$debugService2 === void 0 ? void 0 : _this$debugService2.removeLog(this.id);
       this.emit('remove', {
         target: this,
         type: 'remove'

package/lib/earth/models/atmosphere.js

@@ -68,13 +68,9 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/earth/models/base.js

@@ -136,13 +136,9 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
 
                   _this2.layerService.reRender();
                 });
-                _context.next = 8;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 8:
-                return _context.abrupt("return", _context.sent);
-
-              case 9:
+              case 7:
               case "end":
                 return _context.stop();
             }

package/lib/earth/models/bloomsphere.js

@@ -68,13 +68,9 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/heatmap/models/grid.js

@@ -72,13 +72,9 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/heatmap/models/grid3d.js

@@ -72,13 +72,9 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/heatmap/models/heatmap.js

@@ -168,13 +168,9 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.next = 2;
-                return this.initModels();
+                return _context2.abrupt("return", this.initModels());
 
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context2.stop();
             }

package/lib/heatmap/models/hexagon.js

@@ -72,13 +72,9 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/image/models/image.js

@@ -169,13 +169,9 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                _context2.next = 2;
-                return this.initModels();
+                return _context2.abrupt("return", this.initModels());
 
-              case 2:
-                return _context2.abrupt("return", _context2.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context2.stop();
             }

package/lib/line/models/arc.js

@@ -228,13 +228,9 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.updateTexture();
                 this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/arc_3d.js

@@ -220,13 +220,9 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.updateTexture();
                 this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/earthArc_3d.js

@@ -220,13 +220,9 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.updateTexture();
                 this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/great_circle.js

@@ -205,13 +205,9 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.updateTexture();
                 this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/half.js

@@ -135,13 +135,9 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/line.js

@@ -153,8 +153,8 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
         dashArray.push(0, 0);
       }
 
-      if (this.rendererService.getDirty()) {
-        this.texture && this.texture.bind();
+      if (this.rendererService.getDirty() && this.texture) {
+        this.texture.bind();
       } // 转化渐变色
 
 

package/lib/line/models/linearline.js

@@ -163,13 +163,9 @@ var LinearLineModel = /*#__PURE__*/function (_BaseModel) {
             switch (_context.prev = _context.next) {
               case 0:
                 this.updateTexture();
-                _context.next = 3;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 3:
-                return _context.abrupt("return", _context.sent);
-
-              case 4:
+              case 2:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/simpleLine.js

@@ -130,13 +130,9 @@ var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/lib/line/models/wall.js

@@ -159,13 +159,9 @@ var LineWallModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.updateTexture();
                 this.iconService.on('imageUpdate', this.updateTexture);
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }

package/lib/mask/models/fill.js

@@ -73,13 +73,9 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }
@@ -151,7 +147,10 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var refresh = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-      refresh && this.layerService.clear();
+
+      if (refresh) {
+        this.layerService.clear();
+      }
     }
   }, {
     key: "registerBuiltinAttributes",