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

package/lib/tile/tileFactory/base.js

@@ -33,12 +33,21 @@ var turf = _interopRequireWildcard(require("@turf/helpers"));
 
 var _union = _interopRequireDefault(require("@turf/union"));
 
+var _clone = _interopRequireDefault(require("@turf/clone"));
+
 var _polygonToLine = _interopRequireDefault(require("@turf/polygon-to-line"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var EMPTY_FEATURE_DATA = {
+  features: [],
+  featureId: null,
+  vectorTileLayer: null,
+  source: null
+};
+
 var TileFactory = /*#__PURE__*/function () {
   // 用于记录图层内事件，辅助判断图层外事件逻辑
   function TileFactory(option) {
@@ -57,7 +66,8 @@ var TileFactory = /*#__PURE__*/function () {
     var source = this.parentLayer.getSource();
     this.zoomOffset = source.parser.zoomOffset || 0;
     this.tilesetManager = source.tileset;
-  }
+  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
 
   (0, _createClass2.default)(TileFactory, [{
     key: "createTile",
@@ -70,44 +80,41 @@ var TileFactory = /*#__PURE__*/function () {
   }, {
     key: "getFeatureData",
     value: function getFeatureData(tile, initOptions) {
-      var emptyData = {
-        features: [],
-        featureId: null,
-        vectorTileLayer: null,
-        source: null
-      };
       var sourceLayer = initOptions.sourceLayer,
           featureId = initOptions.featureId,
-          transforms = initOptions.transforms,
+          _initOptions$transfor = initOptions.transforms,
+          transforms = _initOptions$transfor === void 0 ? [] : _initOptions$transfor,
           layerType = initOptions.layerType,
           shape = initOptions.shape;
 
       if (!sourceLayer) {
-        return emptyData;
+        return EMPTY_FEATURE_DATA;
       }
 
       var vectorTileLayer = tile.data.layers[sourceLayer];
       var features = vectorTileLayer === null || vectorTileLayer === void 0 ? void 0 : vectorTileLayer.features;
 
       if (!(Array.isArray(features) && features.length > 0)) {
-        return emptyData;
+        return EMPTY_FEATURE_DATA;
       } else {
         var geofeatures = [];
 
         if (layerType === 'LineLayer' && shape === 'simple') {
           features.map(function (feature) {
-            if (feature.geometry.type === 'MultiPolygon') {
+            var cloneFeature = (0, _clone.default)(feature);
+
+            if (cloneFeature.geometry.type === 'MultiPolygon') {
               var _geofeatures;
 
               // @ts-ignore
-              var linefeatures = (0, _polygonToLine.default)(feature).features;
+              var linefeatures = (0, _polygonToLine.default)(cloneFeature).features;
 
               (_geofeatures = geofeatures).push.apply(_geofeatures, (0, _toConsumableArray2.default)(linefeatures));
-            } else if (feature.geometry.type === 'Polygon') {
-              feature.geometry.type = 'MultiLineString';
-              geofeatures.push(feature);
+            } else if (cloneFeature.geometry.type === 'Polygon') {
+              cloneFeature.geometry.type = 'MultiLineString';
+              geofeatures.push(cloneFeature);
             } else {
-              geofeatures.push(feature);
+              geofeatures.push(cloneFeature);
             }
           });
         } else {
@@ -120,7 +127,8 @@ var TileFactory = /*#__PURE__*/function () {
         }, {
           parser: {
             type: 'geojson',
-            featureId: featureId
+            featureId: featureId,
+            cancelExtent: true
           },
           transforms: transforms
         });
@@ -144,28 +152,43 @@ var TileFactory = /*#__PURE__*/function () {
           color = initOptions.color,
           layerType = initOptions.layerType,
           size = initOptions.size,
-          shape = initOptions.shape;
+          shape = initOptions.shape,
+          usage = initOptions.usage,
+          basemapColor = initOptions.basemapColor,
+          basemapSize = initOptions.basemapSize;
       var FactoryTileLayer = L7Layer ? L7Layer : _vectorLayer.default;
       var layer = new FactoryTileLayer((0, _objectSpread2.default)({
         visible: tile.isVisible,
         tileOrigin: vectorTileLayer === null || vectorTileLayer === void 0 ? void 0 : vectorTileLayer.l7TileOrigin,
         coord: vectorTileLayer === null || vectorTileLayer === void 0 ? void 0 : vectorTileLayer.l7TileCoord
-      }, this.getLayerInitOption(initOptions))); // vector layer set config
+      }, this.getLayerInitOption(initOptions)));
+      if (layerType) layer.type = layerType; // Tip: sign tile layer
+
+      layer.isTileLayer = true; // vector 、raster
+      // vector layer set event
 
-      if (layer.isVector) {
+      if (layer.isVector && usage !== 'basemap') {
         this.emitEvent([layer]);
-        layer.type = layerType;
         layer.select(true);
       } // set source
 
 
-      layer.source(source); // set scale
-
-      this.setScale(layer); // set scale attribute field
+      layer.source(source); // set scale attribute field
 
       this.setStyleAttributeField(layer, 'shape', shape);
-      this.setStyleAttributeField(layer, 'color', color);
-      this.setStyleAttributeField(layer, 'size', size); // set mask
+
+      if (usage !== 'basemap') {
+        // set scale
+        this.setScale(layer);
+        this.setStyleAttributeField(layer, 'color', color);
+        this.setStyleAttributeField(layer, 'size', size);
+      } else {
+        layer.style({
+          color: basemapColor,
+          size: basemapSize
+        });
+      } // set mask
+
 
       var layers = [layer];
 
@@ -173,7 +196,12 @@ var TileFactory = /*#__PURE__*/function () {
         var masklayer = new _mask.default().source({
           type: 'FeatureCollection',
           features: [tile.bboxPolygon]
-        }).shape('fill');
+        }, {
+          parser: {
+            type: 'geojson',
+            cancelExtent: true
+          }
+        });
         layers.push(masklayer);
         layer.addMaskLayer(masklayer);
       } // regist layer
@@ -193,7 +221,7 @@ var TileFactory = /*#__PURE__*/function () {
     value: function getDefautStyleAttributeField(layer, type) {
       switch (type) {
         case 'size':
-          return 2;
+          return 1;
 
         case 'color':
           return '#fff';
@@ -272,8 +300,7 @@ var TileFactory = /*#__PURE__*/function () {
       var tiles = this.tilesetManager.tiles.filter(function (t) {
         return t.key === "".concat(xy[0], ",").concat(xy[1], ",").concat(z);
       });
-      var tile = tiles[0];
-      return tile;
+      return tiles[0];
     }
   }, {
     key: "emitEvent",
@@ -292,7 +319,7 @@ var TileFactory = /*#__PURE__*/function () {
 
               var tile = _this.getTile(lng, lat);
 
-              _this.getFeatureAndEmitEvent(layer, 'subLayerClick', e, isVector, tile);
+              tile && _this.getFeatureAndEmitEvent(layer, 'subLayerClick', e, isVector, tile);
             } else {
               _this.getFeatureAndEmitEvent(layer, 'subLayerClick', e);
             }
@@ -307,7 +334,7 @@ var TileFactory = /*#__PURE__*/function () {
 
               var tile = _this.getTile(lng, lat);
 
-              _this.getFeatureAndEmitEvent(layer, 'subLayerMouseMove', e, isVector, tile);
+              tile && _this.getFeatureAndEmitEvent(layer, 'subLayerMouseMove', e, isVector, tile);
             } else {
               _this.getFeatureAndEmitEvent(layer, 'subLayerMouseMove', e);
             }
@@ -325,7 +352,7 @@ var TileFactory = /*#__PURE__*/function () {
 
               var tile = _this.getTile(lng, lat);
 
-              _this.getFeatureAndEmitEvent(layer, 'subLayerMouseMove', e, isVector, tile);
+              tile && _this.getFeatureAndEmitEvent(layer, 'subLayerMouseMove', e, isVector, tile);
             } else {
               _this.getFeatureAndEmitEvent(layer, 'subLayerMouseEnter', e);
             }

package/lib/tile/tileFactory/line.js

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

package/lib/tile/tileFactory/point.js

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

package/lib/tile/tileFactory/polygon.js

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

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;