@antv/l7-layers 2.19.3 → 2.19.5

package/es/index.d.ts

@@ -9,7 +9,7 @@ import LineLayer from './line/index';
 import PointLayer from './point';
 import PolygonLayer from './polygon';
 import RasterLayer from './raster';
-import TileDebugLayer from './tile/tileFactory/layers/TileDebugLayer';
+import TileDebugLayer from './tile/core/TileDebugLayer';
 import EarthLayer from './earth';
 import MaskLayer from './mask';
 import WindLayer from './wind';

package/es/index.js

@@ -10,7 +10,7 @@ import LineLayer from "./line/index";
 import PointLayer from "./point";
 import PolygonLayer from "./polygon";
 import RasterLayer from "./raster";
-import TileDebugLayer from "./tile/tileFactory/layers/TileDebugLayer";
+import TileDebugLayer from "./tile/core/TileDebugLayer";
 import EarthLayer from "./earth";
 import MaskLayer from "./mask";
 import WindLayer from "./wind";

package/es/line/models/simpleLine.js

@@ -14,9 +14,9 @@ import { SimpleLineTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/simple/simpleline_frag.glsl' */
 var simple_line_frag = "\nvarying vec4 v_color;\nvoid main() {\n  gl_FragColor = v_color;\n\n}\n"; // linear simple line shader
 /* babel-plugin-inline-import '../shaders/simple/simpleline_linear_frag.glsl' */
-var simle_linear_frag = "uniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float opacity;\nvoid main() {\n  gl_FragColor = mix(u_sourceColor, u_targetColor, v_distanceScale);\n  gl_FragColor.a *= opacity; // \u5168\u5C40\u900F\u660E\u5EA6\n}\n";
+var simle_linear_frag = "uniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nvarying float v_distanceScale;\nuniform float u_opacity: 1.0;\nvoid main() {\n  gl_FragColor = mix(u_sourceColor, u_targetColor, v_distanceScale);\n  gl_FragColor.a *= u_opacity; // \u5168\u5C40\u900F\u660E\u5EA6\n}\n";
 /* babel-plugin-inline-import '../shaders/simple/simpleline_vert.glsl' */
-var simple_line_vert = "attribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec3 a_Position;\n\nattribute float a_Total_Distance;\nattribute float a_Distance;\n\nuniform mat4 u_ModelMatrix;\n\n\nuniform float u_opacity: 1.0;\nuniform float u_vertexScale: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\n\n\n\n#pragma include \"projection\"\n\nvarying vec4 v_color;\nvarying float v_distanceScale;\n\nvoid main() {\n\n  v_color = a_Color; \n  v_distanceScale = a_Distance / a_Total_Distance;\n  v_color = vec4(a_Color.xyz, a_Color.w * u_opacity); \n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n  float h = float(a_Position.z) * u_vertexScale; // \u7EBF\u9876\u70B9\u7684\u9AD8\u5EA6 - \u517C\u5BB9\u4E0D\u5B58\u5728\u7B2C\u4E09\u4E2A\u6570\u503C\u7684\u60C5\u51B5\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xy, project_pixel(a_Size.y) + h * 0.2, 1.0));\n  } else {\n    float lineHeight = a_Size.y;\n    // \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      h *= 2.0/pow(2.0, 20.0 - u_Zoom);\n    }\n\n    // #define COORDINATE_SYSTEM_P20 5.0\n    // #define COORDINATE_SYSTEM_P20_OFFSET 6.0\n    // amap1.x\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      lineHeight *= pow(2.0, 20.0 - u_Zoom);\n    }\n\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));\n    gl_PointSize = 10.0;\n  }\n}\n";
+var simple_line_vert = "attribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec3 a_Position;\n\nattribute float a_Total_Distance;\nattribute float a_Distance;\n\nuniform mat4 u_ModelMatrix;\n\n\nuniform float u_opacity: 1.0;\nuniform float u_vertexScale: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\n\n\n\n#pragma include \"projection\"\n\nvarying vec4 v_color;\nvarying float v_distanceScale;\n\nvoid main() {\n\n  v_color = a_Color; \n  v_distanceScale = a_Distance / a_Total_Distance;\n  v_color = vec4(a_Color.xyz, a_Color.w * u_opacity); \n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n  float h = float(a_Position.z) * u_vertexScale; // \u7EBF\u9876\u70B9\u7684\u9AD8\u5EA6 - \u517C\u5BB9\u4E0D\u5B58\u5728\u7B2C\u4E09\u4E2A\u6570\u503C\u7684\u60C5\u51B5\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xy, project_pixel(a_Size.y) + h * 0.2, 1.0));\n  } else {\n    float lineHeight = a_Size.y;\n    // \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      h *= 2.0/pow(2.0, 20.0 - u_Zoom);\n    }\n\n    // amap1.x\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      lineHeight *= pow(2.0, 20.0 - u_Zoom);\n    }\n\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));\n    gl_PointSize = 10.0;\n  }\n}\n";
 var isNumber = lodashUtil.isNumber;
 var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(SimpleLineModel, _BaseModel);

package/es/line/shaders/simple/simpleline_linear_frag.glsl

@@ -1,7 +1,8 @@
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
-uniform float opacity;
+varying float v_distanceScale;
+uniform float u_opacity: 1.0;
 void main() {
   gl_FragColor = mix(u_sourceColor, u_targetColor, v_distanceScale);
-  gl_FragColor.a *= opacity; // 全局透明度
+  gl_FragColor.a *= u_opacity; // 全局透明度
 }

package/es/line/shaders/simple/simpleline_vert.glsl

@@ -39,8 +39,6 @@ void main() {
       h *= 2.0/pow(2.0, 20.0 - u_Zoom);
     }
 
-    // #define COORDINATE_SYSTEM_P20 5.0
-    // #define COORDINATE_SYSTEM_P20_OFFSET 6.0
     // amap1.x
     if(u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {
       // 保持高度相对不变

package/es/plugins/LayerModelPlugin.js

@@ -6,7 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { IDebugLog, ILayerStage } from '@antv/l7-core';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
-import TileLayer from "../tile/tileLayer/BaseLayer";
+import TileLayer from "../tile/core/BaseLayer";
 /**
  * Layer Model 初始化，更新，销毁
  */

package/es/plugins/RegisterStyleAttributePlugin.js

@@ -4,7 +4,7 @@ var _dec, _class;
 import { AttributeType, gl } from '@antv/l7-core';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
-import { isTileGroup } from "../tile/utils";
+import { isTileGroup } from "../tile/utils/utils";
 
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建

package/es/polygon/models/fill.js

@@ -67,14 +67,13 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _this$getModelParams, frag, vert, triangulation, type, _ref2, _ref2$workerEnabled, workerEnabled, enablePicking, model;
+        var _this$getModelParams, frag, vert, triangulation, type, model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _this$getModelParams = this.getModelParams(), frag = _this$getModelParams.frag, vert = _this$getModelParams.vert, triangulation = _this$getModelParams.triangulation, type = _this$getModelParams.type;
-              _ref2 = this.layer.getLayerConfig(), _ref2$workerEnabled = _ref2.workerEnabled, workerEnabled = _ref2$workerEnabled === void 0 ? false : _ref2$workerEnabled, enablePicking = _ref2.enablePicking;
               this.layer.triangulation = triangulation;
-              _context2.next = 5;
+              _context2.next = 4;
               return this.layer.buildLayerModel({
                 moduleName: type,
                 vertexShader: vert,
@@ -84,17 +83,12 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
                 primitive: gl.TRIANGLES,
                 depth: {
                   enable: false
-                },
-                workerEnabled: workerEnabled,
-                workerOptions: {
-                  modelType: type,
-                  enablePicking: enablePicking
                 }
               });
-            case 5:
+            case 4:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 7:
+            case 6:
             case "end":
               return _context2.stop();
           }
@@ -108,12 +102,12 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      var _ref3 = this.layer.getLayerConfig(),
-        _ref3$opacityLinear = _ref3.opacityLinear,
-        opacityLinear = _ref3$opacityLinear === void 0 ? {
+      var _ref2 = this.layer.getLayerConfig(),
+        _ref2$opacityLinear = _ref2.opacityLinear,
+        opacityLinear = _ref2$opacityLinear === void 0 ? {
           enable: false,
           dir: 'in'
-        } : _ref3$opacityLinear;
+        } : _ref2$opacityLinear;
       if (opacityLinear.enable) {
         this.styleAttributeService.registerStyleAttribute({
           name: 'linear',
@@ -137,11 +131,11 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "getModelParams",
     value: function getModelParams() {
-      var _ref4 = this.layer.getLayerConfig(),
-        _ref4$opacityLinear = _ref4.opacityLinear,
-        opacityLinear = _ref4$opacityLinear === void 0 ? {
+      var _ref3 = this.layer.getLayerConfig(),
+        _ref3$opacityLinear = _ref3.opacityLinear,
+        opacityLinear = _ref3$opacityLinear === void 0 ? {
           enable: false
-        } : _ref4$opacityLinear;
+        } : _ref3$opacityLinear;
       if (opacityLinear.enable) {
         return {
           frag: polygon_linear_frag,

package/es/tile/{tileLayer → core}/BaseLayer.js

@@ -7,8 +7,8 @@ import { TYPES } from '@antv/l7-core';
 import { lodashUtil } from '@antv/l7-utils';
 import { TileLayerService } from "../service/TileLayerService";
 import { TilePickService } from "../service/TilePickService";
-import { ProxyFuncs } from "../style/constants";
-import { getTileFactory } from "../tileFactory";
+import { getTileFactory } from "../tile";
+import { ProxyFuncs } from "../utils/constants";
 var debounce = lodashUtil.debounce;
 var BaseTileLayer = /*#__PURE__*/function () {
   // 瓦片是否加载成功
@@ -225,9 +225,11 @@ var BaseTileLayer = /*#__PURE__*/function () {
               }) // 过滤未发生变化的
               .filter(function (tile) {
                 return tile.data;
-              }).filter(function (tile) {
+              }) //
+              .filter(function (tile) {
                 return tile.z >= minZoom && tile.z < maxZoom;
-              }).map( /*#__PURE__*/function () {
+              }) // 过滤不可见见
+              .map( /*#__PURE__*/function () {
                 var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(tile) {
                   var tileInstance, tileLayer;
                   return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -252,7 +254,6 @@ var BaseTileLayer = /*#__PURE__*/function () {
                         break;
                       case 9:
                         // 已加载瓦片
-
                         _this3.tileLayerService.updateTileVisible(tile);
                         _this3.tilePickService.setPickState();
                         _this3.layerService.reRender();

package/es/tile/{tileFactory/layers → core}/TileDebugLayer.d.ts

@@ -1,5 +1,5 @@
-import BaseLayer from '../../../core/BaseLayer';
-import { IBaseLayerStyleOptions } from '../../../core/interface';
+import BaseLayer from '../../core/BaseLayer';
+import { IBaseLayerStyleOptions } from '../../core/interface';
 export default class TileDebugLayer extends BaseLayer<IBaseLayerStyleOptions> {
     type: string;
     zIndex: number;

package/es/tile/{tileFactory/layers → core}/TileDebugLayer.js

@@ -9,7 +9,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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 BaseLayer from "../../../core/BaseLayer";
+import BaseLayer from "../../core/BaseLayer";
 var TileDebugLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(TileDebugLayer, _BaseLayer);
   var _super = _createSuper(TileDebugLayer);

package/es/tile/service/TileLayerService.js

@@ -67,30 +67,23 @@ export 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",
@@ -114,9 +107,12 @@ export 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/es/tile/{tileFactory → tile}/Tile.d.ts

@@ -1,6 +1,8 @@
 import { ILayer, ILngLat, ITile } from '@antv/l7-core';
 import { SourceTile } from '@antv/l7-utils';
-export default abstract class Tile implements ITile {
+import { EventEmitter } from 'eventemitter3';
+export type TileEventType = 'loaded';
+export default abstract class Tile extends EventEmitter implements ITile {
     x: number;
     y: number;
     z: number;

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

@@ -3,24 +3,36 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+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 { createLayerContainer } from '@antv/l7-core';
+import { EventEmitter } from 'eventemitter3';
 import PolygonLayer from "../../polygon";
 import { isNeedMask } from "./util";
-var Tile = /*#__PURE__*/function () {
+var Tile = /*#__PURE__*/function (_EventEmitter) {
+  _inherits(Tile, _EventEmitter);
+  var _super = _createSuper(Tile);
   function Tile(sourceTile, parent) {
+    var _this;
     _classCallCheck(this, Tile);
-    _defineProperty(this, "visible", true);
-    _defineProperty(this, "layers", []);
-    _defineProperty(this, "isLoaded", false);
-    _defineProperty(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);
+    _defineProperty(_assertThisInitialized(_this), "visible", true);
+    _defineProperty(_assertThisInitialized(_this), "layers", []);
+    _defineProperty(_assertThisInitialized(_this), "isLoaded", false);
+    _defineProperty(_assertThisInitialized(_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;
   }
   _createClass(Tile, [{
     key: "getLayers",
@@ -64,7 +76,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 = [];
@@ -75,7 +87,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);
@@ -102,7 +114,9 @@ var Tile = /*#__PURE__*/function () {
                   type: 'geojson',
                   featureId: 'id'
                 }
-              }).shape('fill');
+              }).shape('fill').style({
+                opacity: 0.5
+              });
               container = createLayerContainer(this.parent.sceneContainer);
               mask.setContainer(container, this.parent.sceneContainer);
               _context.next = 5;
@@ -226,5 +240,5 @@ var Tile = /*#__PURE__*/function () {
     }
   }]);
   return Tile;
-}();
+}(EventEmitter);
 export { Tile as default };

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

@@ -30,12 +30,13 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
               vectorLayer = 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(_objectSpread({}, layerOptions)).source(sourceOptions.data, sourceOptions.options); // 初始化数据映射
               Object.keys(attributes).forEach(function (type) {
                 var _attributes$attr, _attributes$attr2;
@@ -43,19 +44,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/lib/index.js

@@ -123,7 +123,7 @@ var _index = _interopRequireDefault(require("./line/index"));
 var _point = _interopRequireDefault(require("./point"));
 var _polygon = _interopRequireDefault(require("./polygon"));
 var _raster = _interopRequireDefault(require("./raster"));
-var _TileDebugLayer = _interopRequireDefault(require("./tile/tileFactory/layers/TileDebugLayer"));
+var _TileDebugLayer = _interopRequireDefault(require("./tile/core/TileDebugLayer"));
 var _earth = _interopRequireDefault(require("./earth"));
 var _mask = _interopRequireDefault(require("./mask"));
 var _wind = _interopRequireDefault(require("./wind"));

package/lib/line/models/simpleLine.js

@@ -21,9 +21,9 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 /* babel-plugin-inline-import '../shaders/simple/simpleline_frag.glsl' */
 var simple_line_frag = "\nvarying vec4 v_color;\nvoid main() {\n  gl_FragColor = v_color;\n\n}\n"; // linear simple line shader
 /* babel-plugin-inline-import '../shaders/simple/simpleline_linear_frag.glsl' */
-var simle_linear_frag = "uniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float opacity;\nvoid main() {\n  gl_FragColor = mix(u_sourceColor, u_targetColor, v_distanceScale);\n  gl_FragColor.a *= opacity; // \u5168\u5C40\u900F\u660E\u5EA6\n}\n";
+var simle_linear_frag = "uniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nvarying float v_distanceScale;\nuniform float u_opacity: 1.0;\nvoid main() {\n  gl_FragColor = mix(u_sourceColor, u_targetColor, v_distanceScale);\n  gl_FragColor.a *= u_opacity; // \u5168\u5C40\u900F\u660E\u5EA6\n}\n";
 /* babel-plugin-inline-import '../shaders/simple/simpleline_vert.glsl' */
-var simple_line_vert = "attribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec3 a_Position;\n\nattribute float a_Total_Distance;\nattribute float a_Distance;\n\nuniform mat4 u_ModelMatrix;\n\n\nuniform float u_opacity: 1.0;\nuniform float u_vertexScale: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\n\n\n\n#pragma include \"projection\"\n\nvarying vec4 v_color;\nvarying float v_distanceScale;\n\nvoid main() {\n\n  v_color = a_Color; \n  v_distanceScale = a_Distance / a_Total_Distance;\n  v_color = vec4(a_Color.xyz, a_Color.w * u_opacity); \n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n  float h = float(a_Position.z) * u_vertexScale; // \u7EBF\u9876\u70B9\u7684\u9AD8\u5EA6 - \u517C\u5BB9\u4E0D\u5B58\u5728\u7B2C\u4E09\u4E2A\u6570\u503C\u7684\u60C5\u51B5\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xy, project_pixel(a_Size.y) + h * 0.2, 1.0));\n  } else {\n    float lineHeight = a_Size.y;\n    // \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      h *= 2.0/pow(2.0, 20.0 - u_Zoom);\n    }\n\n    // #define COORDINATE_SYSTEM_P20 5.0\n    // #define COORDINATE_SYSTEM_P20_OFFSET 6.0\n    // amap1.x\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      lineHeight *= pow(2.0, 20.0 - u_Zoom);\n    }\n\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));\n    gl_PointSize = 10.0;\n  }\n}\n";
+var simple_line_vert = "attribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec3 a_Position;\n\nattribute float a_Total_Distance;\nattribute float a_Distance;\n\nuniform mat4 u_ModelMatrix;\n\n\nuniform float u_opacity: 1.0;\nuniform float u_vertexScale: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\n\n\n\n#pragma include \"projection\"\n\nvarying vec4 v_color;\nvarying float v_distanceScale;\n\nvoid main() {\n\n  v_color = a_Color; \n  v_distanceScale = a_Distance / a_Total_Distance;\n  v_color = vec4(a_Color.xyz, a_Color.w * u_opacity); \n  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));\n\n  float h = float(a_Position.z) * u_vertexScale; // \u7EBF\u9876\u70B9\u7684\u9AD8\u5EA6 - \u517C\u5BB9\u4E0D\u5B58\u5728\u7B2C\u4E09\u4E2A\u6570\u503C\u7684\u60C5\u51B5\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xy, project_pixel(a_Size.y) + h * 0.2, 1.0));\n  } else {\n    float lineHeight = a_Size.y;\n    // \u517C\u5BB9 mapbox \u5728\u7EBF\u9AD8\u5EA6\u4E0A\u7684\u6548\u679C\u8868\u73B0\u57FA\u672C\u4E00\u81F4\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      h *= 2.0/pow(2.0, 20.0 - u_Zoom);\n    }\n\n    // amap1.x\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // \u4FDD\u6301\u9AD8\u5EA6\u76F8\u5BF9\u4E0D\u53D8\n      lineHeight *= pow(2.0, 20.0 - u_Zoom);\n    }\n\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, lineHeight + h, 1.0));\n    gl_PointSize = 10.0;\n  }\n}\n";
 var isNumber = _l7Utils.lodashUtil.isNumber;
 var SimpleLineModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(SimpleLineModel, _BaseModel);

package/lib/line/shaders/simple/simpleline_linear_frag.glsl

@@ -1,7 +1,8 @@
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
-uniform float opacity;
+varying float v_distanceScale;
+uniform float u_opacity: 1.0;
 void main() {
   gl_FragColor = mix(u_sourceColor, u_targetColor, v_distanceScale);
-  gl_FragColor.a *= opacity; // 全局透明度
+  gl_FragColor.a *= u_opacity; // 全局透明度
 }

package/lib/line/shaders/simple/simpleline_vert.glsl

@@ -39,8 +39,6 @@ void main() {
       h *= 2.0/pow(2.0, 20.0 - u_Zoom);
     }
 
-    // #define COORDINATE_SYSTEM_P20 5.0
-    // #define COORDINATE_SYSTEM_P20_OFFSET 6.0
     // amap1.x
     if(u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {
       // 保持高度相对不变

package/lib/plugins/LayerModelPlugin.js

@@ -12,7 +12,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _l7Core = require("@antv/l7-core");
 var _inversify = require("inversify");
 require("reflect-metadata");
-var _BaseLayer = _interopRequireDefault(require("../tile/tileLayer/BaseLayer"));
+var _BaseLayer = _interopRequireDefault(require("../tile/core/BaseLayer"));
 var _dec, _class;
 /**
  * Layer Model 初始化，更新，销毁

package/lib/plugins/RegisterStyleAttributePlugin.js

@@ -10,7 +10,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _l7Core = require("@antv/l7-core");
 var _inversify = require("inversify");
 require("reflect-metadata");
-var _utils = require("../tile/utils");
+var _utils = require("../tile/utils/utils");
 var _dec, _class;
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建

package/lib/polygon/models/fill.js

@@ -74,14 +74,13 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _this$getModelParams, frag, vert, triangulation, type, _ref2, _ref2$workerEnabled, workerEnabled, enablePicking, model;
+        var _this$getModelParams, frag, vert, triangulation, type, model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _this$getModelParams = this.getModelParams(), frag = _this$getModelParams.frag, vert = _this$getModelParams.vert, triangulation = _this$getModelParams.triangulation, type = _this$getModelParams.type;
-              _ref2 = this.layer.getLayerConfig(), _ref2$workerEnabled = _ref2.workerEnabled, workerEnabled = _ref2$workerEnabled === void 0 ? false : _ref2$workerEnabled, enablePicking = _ref2.enablePicking;
               this.layer.triangulation = triangulation;
-              _context2.next = 5;
+              _context2.next = 4;
               return this.layer.buildLayerModel({
                 moduleName: type,
                 vertexShader: vert,
@@ -91,17 +90,12 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
                 primitive: _l7Core.gl.TRIANGLES,
                 depth: {
                   enable: false
-                },
-                workerEnabled: workerEnabled,
-                workerOptions: {
-                  modelType: type,
-                  enablePicking: enablePicking
                 }
               });
-            case 5:
+            case 4:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 7:
+            case 6:
             case "end":
               return _context2.stop();
           }
@@ -115,12 +109,12 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
-      var _ref3 = this.layer.getLayerConfig(),
-        _ref3$opacityLinear = _ref3.opacityLinear,
-        opacityLinear = _ref3$opacityLinear === void 0 ? {
+      var _ref2 = this.layer.getLayerConfig(),
+        _ref2$opacityLinear = _ref2.opacityLinear,
+        opacityLinear = _ref2$opacityLinear === void 0 ? {
           enable: false,
           dir: 'in'
-        } : _ref3$opacityLinear;
+        } : _ref2$opacityLinear;
       if (opacityLinear.enable) {
         this.styleAttributeService.registerStyleAttribute({
           name: 'linear',
@@ -144,11 +138,11 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "getModelParams",
     value: function getModelParams() {
-      var _ref4 = this.layer.getLayerConfig(),
-        _ref4$opacityLinear = _ref4.opacityLinear,
-        opacityLinear = _ref4$opacityLinear === void 0 ? {
+      var _ref3 = this.layer.getLayerConfig(),
+        _ref3$opacityLinear = _ref3.opacityLinear,
+        opacityLinear = _ref3$opacityLinear === void 0 ? {
           enable: false
-        } : _ref4$opacityLinear;
+        } : _ref3$opacityLinear;
       if (opacityLinear.enable) {
         return {
           frag: polygon_linear_frag,

package/lib/tile/{tileLayer → core}/BaseLayer.js

@@ -14,8 +14,8 @@ var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _TileLayerService = require("../service/TileLayerService");
 var _TilePickService = require("../service/TilePickService");
-var _constants = require("../style/constants");
-var _tileFactory = require("../tileFactory");
+var _tile = require("../tile");
+var _constants = require("../utils/constants");
 var debounce = _l7Utils.lodashUtil.debounce;
 var BaseTileLayer = /*#__PURE__*/function () {
   // 瓦片是否加载成功
@@ -232,9 +232,11 @@ var BaseTileLayer = /*#__PURE__*/function () {
               }) // 过滤未发生变化的
               .filter(function (tile) {
                 return tile.data;
-              }).filter(function (tile) {
+              }) //
+              .filter(function (tile) {
                 return tile.z >= minZoom && tile.z < maxZoom;
-              }).map( /*#__PURE__*/function () {
+              }) // 过滤不可见见
+              .map( /*#__PURE__*/function () {
                 var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(tile) {
                   var tileInstance, tileLayer;
                   return _regenerator.default.wrap(function _callee$(_context) {
@@ -244,7 +246,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
                           _context.next = 9;
                           break;
                         }
-                        tileInstance = (0, _tileFactory.getTileFactory)(_this3.parent);
+                        tileInstance = (0, _tile.getTileFactory)(_this3.parent);
                         tileLayer = new tileInstance(tile, _this3.parent);
                         _context.next = 5;
                         return tileLayer.initTileLayer();
@@ -259,7 +261,6 @@ var BaseTileLayer = /*#__PURE__*/function () {
                         break;
                       case 9:
                         // 已加载瓦片
-
                         _this3.tileLayerService.updateTileVisible(tile);
                         _this3.tilePickService.setPickState();
                         _this3.layerService.reRender();

package/lib/tile/{tileFactory/layers → core}/TileDebugLayer.js

@@ -14,7 +14,7 @@ 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 _BaseLayer2 = _interopRequireDefault(require("../../../core/BaseLayer"));
+var _BaseLayer2 = _interopRequireDefault(require("../../core/BaseLayer"));
 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 TileDebugLayer = /*#__PURE__*/function (_BaseLayer) {