@antv/l7-layers 2.15.2 → 2.15.3

package/es/tile/tileFactory/RasterTile.js

@@ -8,11 +8,8 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 var _excluded = ["rasterData"];
 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 { getDefaultDomain } from '@antv/l7-utils';
 import RasterLayer from "../../raster";
 import Tile from "./Tile";
@@ -20,74 +17,58 @@ var DEFAULT_COLOR_TEXTURE_OPTION = {
   positions: [0, 1],
   colors: ['#000', '#fff']
 };
-
 var RasterTile = /*#__PURE__*/function (_Tile) {
   _inherits(RasterTile, _Tile);
-
   var _super = _createSuper(RasterTile);
-
   function RasterTile() {
     _classCallCheck(this, RasterTile);
-
     return _super.apply(this, arguments);
   }
-
   _createClass(RasterTile, [{
     key: "initTileLayer",
     value: function () {
       var _initTileLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var attributes, layerOptions, sourceOptions, _ref, rampColors, domain, layer;
-
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                attributes = this.parent.getLayerAttributeConfig();
-                layerOptions = this.getLayerOptions();
-                sourceOptions = this.getSourceOption();
-                _ref = this.getLayerOptions(), rampColors = _ref.rampColors, domain = _ref.domain;
-                this.colorTexture = this.parent.textureService.getColorTexture(rampColors, domain);
-                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;
-
-                  var attr = type; // @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 = 9;
-                return this.addLayer(layer);
-
-              case 9:
-                this.isLoaded = true;
-
-              case 10:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              attributes = this.parent.getLayerAttributeConfig();
+              layerOptions = this.getLayerOptions();
+              sourceOptions = this.getSourceOption();
+              _ref = this.getLayerOptions(), rampColors = _ref.rampColors, domain = _ref.domain;
+              this.colorTexture = this.parent.textureService.getColorTexture(rampColors, domain);
+              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;
+                var attr = type;
+                // @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 = 9;
+              return this.addLayer(layer);
+            case 9:
+              this.isLoaded = true;
+            case 10:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function initTileLayer() {
         return _initTileLayer.apply(this, arguments);
       }
-
       return initTileLayer;
     }()
   }, {
     key: "getSourceOption",
     value: function getSourceOption() {
       var rawSource = this.parent.getSource();
-
       var _this$sourceTile$data = this.sourceTile.data.data,
-          rasterData = _this$sourceTile$data.rasterData,
-          res = _objectWithoutProperties(_this$sourceTile$data, _excluded);
-
+        rasterData = _this$sourceTile$data.rasterData,
+        res = _objectWithoutProperties(_this$sourceTile$data, _excluded);
       return {
         data: rasterData,
         options: {
@@ -99,24 +80,22 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
         }
       };
     }
+
     /**
      * 用于 style 更新 colorTexture 的优化
      * @param arg
      */
-
   }, {
     key: "styleUpdate",
     value: function styleUpdate() {
       var _this = this;
-
       for (var _len = arguments.length, arg = new Array(_len), _key = 0; _key < _len; _key++) {
         arg[_key] = arguments[_key];
       }
-
       var _ref2 = arg,
-          _ref2$rampColors = _ref2.rampColors,
-          rampColors = _ref2$rampColors === void 0 ? DEFAULT_COLOR_TEXTURE_OPTION : _ref2$rampColors,
-          domain = _ref2.domain;
+        _ref2$rampColors = _ref2.rampColors,
+        rampColors = _ref2$rampColors === void 0 ? DEFAULT_COLOR_TEXTURE_OPTION : _ref2$rampColors,
+        domain = _ref2.domain;
       this.colorTexture = this.parent.textureService.getColorTexture(rampColors, domain || getDefaultDomain(rampColors));
       this.layers.forEach(function (layer) {
         return layer.style({
@@ -132,8 +111,6 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
       });
     }
   }]);
-
   return RasterTile;
 }(Tile);
-
 export { RasterTile as default };

package/es/tile/tileFactory/Tile.js

@@ -8,19 +8,13 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { createLayerContainer } from '@antv/l7-core';
 import PolygonLayer from "../../polygon";
 import { isNeedMask } from "./util";
-
 var Tile = /*#__PURE__*/function () {
   function Tile(sourceTile, parent) {
     _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;
@@ -28,13 +22,13 @@ var Tile = /*#__PURE__*/function () {
     this.z = sourceTile.z;
     this.key = "".concat(this.x, "_").concat(this.y, "_").concat(this.z);
   }
-
   _createClass(Tile, [{
     key: "getLayers",
     value: function getLayers() {
       return this.layers;
-    } // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    }
 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "styleUpdate",
     value: function styleUpdate() {
@@ -44,20 +38,18 @@ var Tile = /*#__PURE__*/function () {
     key: "lnglatInBounds",
     value: function lnglatInBounds(lnglat) {
       var _this$sourceTile$boun = _slicedToArray(this.sourceTile.bounds, 4),
-          minLng = _this$sourceTile$boun[0],
-          minLat = _this$sourceTile$boun[1],
-          maxLng = _this$sourceTile$boun[2],
-          maxLat = _this$sourceTile$boun[3];
-
+        minLng = _this$sourceTile$boun[0],
+        minLat = _this$sourceTile$boun[1],
+        maxLng = _this$sourceTile$boun[2],
+        maxLat = _this$sourceTile$boun[3];
       var lng = lnglat.lng,
-          lat = lnglat.lat;
+        lat = lnglat.lat;
       return lng >= minLng && lng <= maxLng && lat >= minLat && lat <= maxLat;
     }
   }, {
     key: "getLayerOptions",
     value: function getLayerOptions() {
       var _options$maskLayers;
-
       var options = this.parent.getLayerConfig();
       return _objectSpread(_objectSpread({}, options), {}, {
         autoFit: false,
@@ -65,16 +57,14 @@ var Tile = /*#__PURE__*/function () {
         tileMask: isNeedMask(this.parent.type),
         mask: options.mask || ((_options$maskLayers = options.maskLayers) === null || _options$maskLayers === void 0 ? void 0 : _options$maskLayers.length) !== 0 && options.enableMask
       });
-    } // 获取Mask 图层
-
+    }
+    // 获取Mask 图层
   }, {
     key: "getMaskLayer",
     value: function getMaskLayer() {
       var _this = this;
-
       var _this$parent$getLayer = this.parent.getLayerConfig(),
-          maskLayers = _this$parent$getLayer.maskLayers;
-
+        maskLayers = _this$parent$getLayer.maskLayers;
       var layers = [];
       maskLayers === null || maskLayers === void 0 ? void 0 : maskLayers.forEach(function (layer) {
         if (!layer.tileLayer) {
@@ -82,11 +72,9 @@ var Tile = /*#__PURE__*/function () {
           layers.push(layer);
           return layer;
         }
-
         var tileLayer = layer.tileLayer;
         var tile = tileLayer.getTile(_this.sourceTile.key);
         var l = tile === null || tile === void 0 ? void 0 : tile.getLayers()[0];
-
         if (l) {
           layers.push(l);
         }
@@ -99,48 +87,40 @@ var Tile = /*#__PURE__*/function () {
       var _addTileMask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var mask, container, mainLayer;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                mask = new PolygonLayer({
-                  visible: false,
-                  enablePicking: false
-                }).source({
-                  type: 'FeatureCollection',
-                  features: [this.sourceTile.bboxPolygon]
-                }, {
-                  parser: {
-                    type: 'geojson',
-                    featureId: 'id'
-                  }
-                }).shape('fill');
-                container = createLayerContainer(this.parent.sceneContainer);
-                mask.setContainer(container, this.parent.sceneContainer);
-                _context.next = 5;
-                return mask.init();
-
-              case 5:
-                this.tileMask = mask;
-                mainLayer = this.getMainLayer();
-
-                if (mainLayer !== undefined) {
-                  mainLayer.tileMask = mask;
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              mask = new PolygonLayer({
+                visible: false,
+                enablePicking: false
+              }).source({
+                type: 'FeatureCollection',
+                features: [this.sourceTile.bboxPolygon]
+              }, {
+                parser: {
+                  type: 'geojson',
+                  featureId: 'id'
                 }
-
-                return _context.abrupt("return", mask);
-
-              case 9:
-              case "end":
-                return _context.stop();
-            }
+              }).shape('fill');
+              container = createLayerContainer(this.parent.sceneContainer);
+              mask.setContainer(container, this.parent.sceneContainer);
+              _context.next = 5;
+              return mask.init();
+            case 5:
+              this.tileMask = mask;
+              mainLayer = this.getMainLayer();
+              if (mainLayer !== undefined) {
+                mainLayer.tileMask = mask;
+              }
+              return _context.abrupt("return", mask);
+            case 9:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function addTileMask() {
         return _addTileMask.apply(this, arguments);
       }
-
       return addTileMask;
     }()
   }, {
@@ -149,30 +129,24 @@ var Tile = /*#__PURE__*/function () {
       var _addMask = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layer, mask) {
         var container;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                container = createLayerContainer(this.parent.sceneContainer);
-                mask.setContainer(container, this.parent.sceneContainer);
-                _context2.next = 4;
-                return mask.init();
-
-              case 4:
-                layer.addMask(mask);
-                this.tileMaskLayers.push(mask);
-
-              case 6:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              container = createLayerContainer(this.parent.sceneContainer);
+              mask.setContainer(container, this.parent.sceneContainer);
+              _context2.next = 4;
+              return mask.init();
+            case 4:
+              layer.addMask(mask);
+              this.tileMaskLayers.push(mask);
+            case 6:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function addMask(_x, _x2) {
         return _addMask.apply(this, arguments);
       }
-
       return addMask;
     }()
   }, {
@@ -181,29 +155,24 @@ var Tile = /*#__PURE__*/function () {
       var _addLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(layer) {
         var container;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                // set flag
-                layer.isTileLayer = true;
-                container = createLayerContainer(this.parent.sceneContainer);
-                layer.setContainer(container, this.parent.sceneContainer);
-                this.layers.push(layer);
-                _context3.next = 6;
-                return layer.init();
-
-              case 6:
-              case "end":
-                return _context3.stop();
-            }
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              // set flag
+              layer.isTileLayer = true;
+              container = createLayerContainer(this.parent.sceneContainer);
+              layer.setContainer(container, this.parent.sceneContainer);
+              this.layers.push(layer);
+              _context3.next = 6;
+              return layer.init();
+            case 6:
+            case "end":
+              return _context3.stop();
           }
         }, _callee3, this);
       }));
-
       function addLayer(_x3) {
         return _addLayer.apply(this, arguments);
       }
-
       return addLayer;
     }()
   }, {
@@ -219,10 +188,10 @@ var Tile = /*#__PURE__*/function () {
         l.updateLayerConfig(_defineProperty({}, key, value));
       });
     }
+
     /**
      * 一个 Tile 可能有多个 layer，但是在发生拾取、点击事件的时候只有一个生效
      */
-
   }, {
     key: "getMainLayer",
     value: function getMainLayer() {
@@ -233,12 +202,12 @@ var Tile = /*#__PURE__*/function () {
     value: function getFeatures(sourceLayer) {
       return [];
     }
+
     /**
      * 在一个 Tile 中可能存在一个相同 ID 的 feature
      * @param id
      * @returns
      */
-
   }, {
     key: "getFeatureById",
     value: function getFeatureById(id) {
@@ -248,15 +217,12 @@ var Tile = /*#__PURE__*/function () {
     key: "destroy",
     value: function destroy() {
       var _this$tileMask;
-
       (_this$tileMask = this.tileMask) === null || _this$tileMask === void 0 ? void 0 : _this$tileMask.destroy();
       this.layers.forEach(function (layer) {
         return layer.destroy();
       });
     }
   }]);
-
   return Tile;
 }();
-
 export { Tile as default };

package/es/tile/tileFactory/VectorTile.js

@@ -6,98 +6,75 @@ 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 _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 Tile from "./Tile";
 import { getTileLayer } from "./util";
-
 var VectorTile = /*#__PURE__*/function (_Tile) {
   _inherits(VectorTile, _Tile);
-
   var _super = _createSuper(VectorTile);
-
   function VectorTile() {
     _classCallCheck(this, VectorTile);
-
     return _super.apply(this, arguments);
   }
-
   _createClass(VectorTile, [{
     key: "initTileLayer",
     value: function () {
       var _initTileLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var attributes, layerOptions, vectorLayer, sourceOptions, layer;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                attributes = this.parent.getLayerAttributeConfig();
-                layerOptions = this.getLayerOptions();
-                vectorLayer = getTileLayer(this.parent.type);
-                sourceOptions = this.getSourceOption();
-
-                if (sourceOptions) {
-                  _context.next = 7;
-                  break;
-                }
-
-                this.isLoaded = true;
-                return _context.abrupt("return");
-
-              case 7:
-                layer = new vectorLayer(_objectSpread({}, layerOptions)).source(sourceOptions.data, sourceOptions.options); // 初始化数据映射
-
-                Object.keys(attributes).forEach(function (type) {
-                  var _attributes$attr, _attributes$attr2;
-
-                  var attr = type; // @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;
-                return this.addLayer(layer);
-
-              case 11:
-                if (!layerOptions.tileMask) {
-                  _context.next = 14;
-                  break;
-                }
-
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              attributes = this.parent.getLayerAttributeConfig();
+              layerOptions = this.getLayerOptions();
+              vectorLayer = getTileLayer(this.parent.type);
+              sourceOptions = this.getSourceOption();
+              if (sourceOptions) {
+                _context.next = 7;
+                break;
+              }
+              this.isLoaded = true;
+              return _context.abrupt("return");
+            case 7:
+              layer = new vectorLayer(_objectSpread({}, layerOptions)).source(sourceOptions.data, sourceOptions.options); // 初始化数据映射
+              Object.keys(attributes).forEach(function (type) {
+                var _attributes$attr, _attributes$attr2;
+                var attr = type;
+                // @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;
+              return this.addLayer(layer);
+            case 11:
+              if (!layerOptions.tileMask) {
                 _context.next = 14;
-                return this.addTileMask();
-
-              case 14:
-                this.setLayerMinMaxZoom(layer);
-                this.isLoaded = true;
-
-              case 16:
-              case "end":
-                return _context.stop();
-            }
+                break;
+              }
+              _context.next = 14;
+              return this.addTileMask();
+            case 14:
+              this.setLayerMinMaxZoom(layer);
+              this.isLoaded = true;
+            case 16:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function initTileLayer() {
         return _initTileLayer.apply(this, arguments);
       }
-
       return initTileLayer;
     }()
   }, {
     key: "getSourceOption",
     value: function getSourceOption() {
       var rawSource = this.parent.getSource();
-
       var _this$parent$getLayer = this.parent.getLayerConfig(),
-          _this$parent$getLayer2 = _this$parent$getLayer.sourceLayer,
-          sourceLayer = _this$parent$getLayer2 === void 0 ? 'defaultLayer' : _this$parent$getLayer2,
-          _this$parent$getLayer3 = _this$parent$getLayer.featureId,
-          featureId = _this$parent$getLayer3 === void 0 ? 'id' : _this$parent$getLayer3;
-
+        _this$parent$getLayer2 = _this$parent$getLayer.sourceLayer,
+        sourceLayer = _this$parent$getLayer2 === void 0 ? 'defaultLayer' : _this$parent$getLayer2,
+        _this$parent$getLayer3 = _this$parent$getLayer.featureId,
+        featureId = _this$parent$getLayer3 === void 0 ? 'id' : _this$parent$getLayer3;
       var features = this.getFeatures(sourceLayer);
       return {
         data: {
@@ -123,37 +100,33 @@ var VectorTile = /*#__PURE__*/function (_Tile) {
           minZoom: this.z - 1
         });
       }
-    } // 获取瓦片数据
-
+    }
+    // 获取瓦片数据
   }, {
     key: "getFeatures",
     value: function getFeatures(sourceLayer) {
       var source = this.sourceTile.data;
       return source.getTileData(sourceLayer);
     }
+
     /**
      * 在一个 Tile 中可能存在一个相同 ID 的 feature
      * @param id
      * @returns
      */
-
   }, {
     key: "getFeatureById",
     value: function getFeatureById(id) {
       var layer = this.getMainLayer();
-
       if (!layer) {
         return [];
       }
-
       var res = layer.getSource().data.dataArray.filter(function (d) {
         return d._id === id;
       });
       return res;
     }
   }]);
-
   return VectorTile;
 }(Tile);
-
 export { VectorTile as default };

package/es/tile/tileFactory/index.js

@@ -8,43 +8,32 @@ import RasterTile from "./RasterTile";
 import VectorTile from "./VectorTile";
 export function getTileFactory(layer) {
   var tileType = layer.type;
-
   switch (tileType) {
     case 'PolygonLayer':
       return VectorTile;
-
     case 'LineLayer':
       return VectorTile;
-
     case 'PointLayer':
       return VectorTile;
-
     case 'TileDebugLayer':
       return DebugTile;
-
     case 'MaskLayer':
       return MaskLayer;
-
     case 'RasterLayer':
       var dataType = layer.getSource().parser.dataType;
-
       switch (dataType) {
         case RasterTileType.RGB:
         case RasterTileType.CUSTOMRGB:
           return RasterRGBTile;
-
         case RasterTileType.ARRAYBUFFER:
         case RasterTileType.CUSTOMARRAYBUFFER:
           return RasterTile;
-
         case RasterTileType.TERRAINRGB:
         case RasterTileType.CUSTOMTERRAINRGB:
           return RasterTerrainRGBTile;
-
         default:
           return ImageTile;
       }
-
     default:
       return VectorTile;
   }