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

package/lib/tile/tileFactory/raster.js

@@ -56,6 +56,9 @@ var RasterTile = /*#__PURE__*/function (_TileFactory) {
         initOptions: initOptions,
         source: source
       });
+      layer.once('modelLoaded', function () {
+        tile.layerLoad();
+      });
       return {
         layers: [layer],
         layerIDList: [layer.id]

package/lib/tile/tileFactory/rasterData.js

@@ -81,6 +81,9 @@ var RasterTiffTile = /*#__PURE__*/function (_TileFactory) {
       });
       this.emitEvent([layer], false);
       (0, _utils.registerLayers)(this.parentLayer, [layer]);
+      layer.once('modelLoaded', function () {
+        tile.layerLoad();
+      });
       return {
         layers: [layer],
         layerIDList: [layer.id]

package/lib/tile/tileFactory/rasterDataLayer.js

@@ -58,7 +58,9 @@ var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
       this.layerModel.initModels(function (models) {
         _this2.models = models;
 
-        _this2.renderLayers();
+        _this2.emit('modelLoaded', null);
+
+        _this2.layerService.throttleRenderLayers();
       });
     }
   }, {
@@ -67,7 +69,9 @@ var RasterTiffLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this3.models = models;
+
+        _this3.emit('modelLoaded', null);
       });
     }
   }, {

package/lib/tile/tileFactory/test.js

@@ -65,24 +65,45 @@ var TestTile = /*#__PURE__*/function (_TileFactory) {
 
       var properties = features[0].properties;
       var text = new _vectorLayer.default({
-        layerType: 'PointLayer'
+        layerType: 'PointLayer',
+        usage: 'basemap'
       }).source([properties], {
         parser: {
           type: 'json',
           x: 'textLng',
-          y: 'textLat'
+          y: 'textLat',
+          cancelExtent: true
         }
-      }).shape('key', 'text').size(20).color('#000').style({
+      }).shape('key', 'text').style({
+        size: 20,
+        color: '#000',
         stroke: '#fff',
         strokeWidth: 2
       });
       var line = new _vectorLayer.default({
-        layerType: 'LineLayer'
+        layerType: 'LineLayer',
+        usage: 'basemap'
       }).source({
         type: 'FeatureCollection',
         features: features
-      }).shape('simple').color('#000');
+      }, {
+        parser: {
+          type: 'geojson',
+          cancelExtent: true
+        }
+      }).shape('simple').style({
+        color: '#000'
+      }); // Tip: sign tile layer
+
+      text.isTileLayer = true;
+      line.isTileLayer = true;
       (0, _utils.registerLayers)(this.parentLayer, [line, text]);
+      text.once('modelLoaded', function () {
+        tile.layerLoad();
+      });
+      line.once('modelLoaded', function () {
+        tile.layerLoad();
+      });
       return {
         layers: [line, text],
         layerIDList: [line.id, text.id]

package/lib/tile/tileFactory/vectorLayer.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -21,11 +23,13 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _l7Core = require("@antv/l7-core");
+
 var _BaseLayer2 = _interopRequireDefault(require("../../core/BaseLayer"));
 
 var _tile = _interopRequireDefault(require("../../line/models/tile"));
 
-var _simpleLine = _interopRequireDefault(require("../../line/models/simpleLine"));
+var _simpleTileLine = _interopRequireDefault(require("../../line/models/simpleTileLine"));
 
 var _tileText = _interopRequireDefault(require("../../point/models/tileText"));
 
@@ -33,6 +37,12 @@ var _tile2 = _interopRequireDefault(require("../../point/models/tile"));
 
 var _tile3 = _interopRequireDefault(require("../../polygon/models/tile"));
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 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; } }
@@ -53,12 +63,102 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
 
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isVector", true);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", _this.layerType);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", _this.layerType || 'vectorLayer');
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "pickedID", null);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "sourceEvent", function () {
+      // Tip: vector 不支持 autoFit
+      _this.dataState.dataSourceNeedUpdate = true;
+
+      _this.reRender();
+    });
     return _this;
   }
 
   (0, _createClass2.default)(VectorLayer, [{
+    key: "init",
+    value: function init() {
+      var _this2 = this;
+
+      // 设置配置项
+      var sceneId = this.container.get(_l7Core.TYPES.SceneID);
+      this.configService.setLayerConfig(sceneId, this.id, this.rawConfig);
+      this.layerType = this.rawConfig.layerType;
+
+      if (this.type === 'PointLayer') {
+        // Tip: iconService 和 fontService 只有在矢量点图层中才会被使用
+        this.iconService = this.container.get(_l7Core.TYPES.IIconService);
+        this.fontService = this.container.get(_l7Core.TYPES.IFontService);
+      }
+
+      this.rendererService = this.container.get(_l7Core.TYPES.IRendererService);
+      this.layerService = this.container.get(_l7Core.TYPES.ILayerService);
+      this.mapService = this.container.get(_l7Core.TYPES.IMapService);
+      this.cameraService = this.container.get(_l7Core.TYPES.ICameraService);
+      this.coordinateService = this.container.get(_l7Core.TYPES.ICoordinateSystemService);
+      this.shaderModuleService = this.container.get(_l7Core.TYPES.IShaderModuleService);
+      this.postProcessingPassFactory = this.container.get(_l7Core.TYPES.IFactoryPostProcessingPass);
+      this.normalPassFactory = this.container.get(_l7Core.TYPES.IFactoryNormalPass); // 图层容器服务
+
+      this.styleAttributeService = this.container.get(_l7Core.TYPES.IStyleAttributeService); // 完成样式服务注册完成前添加的属性
+
+      this.pendingStyleAttributes.forEach(function (_ref) {
+        var attributeName = _ref.attributeName,
+            attributeField = _ref.attributeField,
+            attributeValues = _ref.attributeValues,
+            updateOptions = _ref.updateOptions;
+
+        _this2.styleAttributeService.updateStyleAttribute(attributeName, {
+          // @ts-ignore
+          scale: (0, _objectSpread2.default)({
+            field: attributeField
+          }, _this2.splitValuesAndCallbackInAttribute( // @ts-ignore
+          attributeValues, // @ts-ignore
+          _this2.getLayerConfig()[attributeName]))
+        }, // @ts-ignore
+        updateOptions);
+      });
+      this.pendingStyleAttributes = []; // 获取插件集
+
+      this.plugins = this.container.getAll(_l7Core.TYPES.ILayerPlugin); // 完成插件注册，传入场景和图层容器内的服务
+
+      var _iterator = _createForOfIteratorHelper(this.plugins),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var plugin = _step.value;
+          plugin.apply(this, {
+            rendererService: this.rendererService,
+            mapService: this.mapService,
+            styleAttributeService: this.styleAttributeService,
+            normalPassFactory: this.normalPassFactory,
+            postProcessingPassFactory: this.postProcessingPassFactory
+          });
+        } // 触发 init 生命周期插件
+
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      this.hooks.init.call();
+      this.hooks.afterInit.call();
+      return this;
+    }
+  }, {
+    key: "renderModels",
+    value: function renderModels(isPicking) {
+      var _this3 = this;
+
+      this.models.forEach(function (model) {
+        model.draw({
+          uniforms: _this3.layerModel.getUninforms()
+        }, isPicking);
+      });
+      return this;
+    }
+  }, {
     key: "getPickID",
     value: function getPickID() {
       return this.pickedID;
@@ -71,23 +171,27 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
   }, {
     key: "buildModels",
     value: function buildModels() {
-      var _this2 = this;
+      var _this4 = this;
 
       var model = this.getModelType();
       this.layerModel = new model(this);
       this.layerModel.initModels(function (models) {
-        _this2.models = models;
+        _this4.models = models;
 
-        _this2.renderLayers();
+        _this4.emit('modelLoaded', null);
+
+        _this4.layerService.throttleRenderLayers();
       });
     }
   }, {
     key: "rebuildModels",
     value: function rebuildModels() {
-      var _this3 = this;
+      var _this5 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this5.models = models;
+
+        _this5.emit('modelLoaded', null);
       });
     }
   }, {
@@ -121,7 +225,7 @@ var VectorLayer = /*#__PURE__*/function (_BaseLayer) {
           return _tile.default;
 
         case 'simple':
-          return _simpleLine.default;
+          return _simpleTileLine.default;
 
         default:
           return _tile.default;

package/lib/tile/tileLayer/baseMapTileLayer.js

@@ -0,0 +1,195 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _baseMapTileLayerManager = require("../manager/baseMapTileLayerManager");
+
+var _lodash = require("lodash");
+
+var BaseTileLayer = /*#__PURE__*/function () {
+  function BaseTileLayer(_ref) {
+    var _parentSource$data;
+
+    var parent = _ref.parent,
+        rendererService = _ref.rendererService,
+        mapService = _ref.mapService,
+        layerService = _ref.layerService;
+    (0, _classCallCheck2.default)(this, BaseTileLayer);
+    (0, _defineProperty2.default)(this, "type", 'baseTile');
+    (0, _defineProperty2.default)(this, "initedTileset", false);
+    (0, _defineProperty2.default)(this, "viewchange", (0, _lodash.debounce)(this.mapchange, 200));
+    var parentSource = parent.getSource();
+
+    var _ref2 = (parentSource === null || parentSource === void 0 ? void 0 : (_parentSource$data = parentSource.data) === null || _parentSource$data === void 0 ? void 0 : _parentSource$data.tilesetOptions) || {},
+        sourceLayer = _ref2.sourceLayer;
+
+    this.sourceLayer = sourceLayer;
+    this.parent = parent;
+    this.mapService = mapService;
+    this.layerService = layerService;
+    this.tileLayerManager = new _baseMapTileLayerManager.BaseMapTileLayerManager(parent, mapService, rendererService);
+    this.initTileSetManager();
+  }
+  /**
+   * 渲染瓦片的图层
+   */
+
+
+  (0, _createClass2.default)(BaseTileLayer, [{
+    key: "children",
+    get: function get() {
+      return this.tileLayerManager.children;
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      if (this.tileLayerManager) {
+        this.tileLayerManager.render();
+      }
+    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
+  }, {
+    key: "tileLoaded",
+    value: function tileLoaded(tile) {//
+    }
+  }, {
+    key: "tileError",
+    value: function tileError(error) {
+      console.warn('error:', error);
+    }
+  }, {
+    key: "tileUnLoad",
+    value: function tileUnLoad(tile) {
+      this.tileLayerManager.removeChilds(tile.layerIDList, false);
+    }
+  }, {
+    key: "tileUpdate",
+    value: function tileUpdate() {
+      // Base Function
+      if (!this.tilesetManager) {
+        return;
+      }
+
+      if (this.tilesetManager.isLoaded) {
+        // 将事件抛出，图层上可以使用瓦片
+        this.parent.emit('tiles-loaded', this.tilesetManager.currentTiles);
+      }
+    }
+  }, {
+    key: "initTileSetManager",
+    value: function initTileSetManager() {
+      var _this$tilesetManager;
+
+      var source = this.parent.getSource();
+      this.tilesetManager = source.tileset;
+
+      if (!this.initedTileset) {
+        this.bindTilesetEvent();
+        this.initedTileset = true;
+      }
+
+      var _this$getCurrentView = this.getCurrentView(),
+          latLonBounds = _this$getCurrentView.latLonBounds,
+          zoom = _this$getCurrentView.zoom;
+
+      (_this$tilesetManager = this.tilesetManager) === null || _this$tilesetManager === void 0 ? void 0 : _this$tilesetManager.update(zoom, latLonBounds);
+    }
+  }, {
+    key: "mapchange",
+    value: function mapchange() {
+      var _this$tilesetManager2;
+
+      var _this$getCurrentView2 = this.getCurrentView(),
+          latLonBounds = _this$getCurrentView2.latLonBounds,
+          zoom = _this$getCurrentView2.zoom;
+
+      if (this.mapService.version === 'GAODE1.x') {
+        var _this$parent$getLayer = this.parent.getLayerConfig(),
+            visible = _this$parent$getLayer.visible;
+
+        if (zoom < 3 && visible) {
+          this.parent.updateLayerConfig({
+            visible: false
+          });
+          this.layerService.reRender();
+        } else if (zoom >= 3 && !visible) {
+          this.parent.updateLayerConfig({
+            visible: true
+          });
+          this.layerService.reRender();
+        }
+      }
+
+      if (this.lastViewStates && this.lastViewStates.zoom === zoom && this.lastViewStates.latLonBounds.toString() === latLonBounds.toString()) {
+        return;
+      }
+
+      this.lastViewStates = {
+        zoom: zoom,
+        latLonBounds: latLonBounds
+      };
+      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.update(zoom, latLonBounds);
+    }
+  }, {
+    key: "bindTilesetEvent",
+    value: function bindTilesetEvent() {
+      var _this = this;
+
+      if (!this.tilesetManager) {
+        return;
+      } // 瓦片数据加载成功
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
+
+      this.tilesetManager.on('tile-loaded', function (tile) {// 将事件抛出，图层上可以监听使用
+      }); // 瓦片数据从缓存删除或被执行重新加载
+
+      this.tilesetManager.on('tile-unload', function (tile) {
+        // 将事件抛出，图层上可以监听使用
+        _this.tileUnLoad(tile);
+      }); // 瓦片数据加载失败
+
+      this.tilesetManager.on('tile-error', function (error, tile) {
+        // 将事件抛出，图层上可以监听使用
+        _this.tileError(error);
+      }); // 瓦片显隐状态更新
+
+      this.tilesetManager.on('tile-update', function () {
+        _this.tileUpdate();
+      }); // 地图视野发生改变
+
+      this.mapService.on('zoomend', function () {
+        return _this.viewchange();
+      });
+      this.mapService.on('moveend', function () {
+        return _this.viewchange();
+      });
+    } //  防抖操作
+
+  }, {
+    key: "getCurrentView",
+    value: function getCurrentView() {
+      var bounds = this.mapService.getBounds();
+      var latLonBounds = [bounds[0][0], bounds[0][1], bounds[1][0], bounds[1][1]];
+      var zoom = this.mapService.getZoom();
+      return {
+        latLonBounds: latLonBounds,
+        zoom: zoom
+      };
+    }
+  }]);
+  return BaseTileLayer;
+}();
+
+exports.default = BaseTileLayer;