@antv/l7-layers 2.21.1 → 2.21.2

package/es/tile/interaction/getRasterData.js

@@ -1,45 +1,39 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { DOM } from '@antv/l7-utils';
 export function readRasterValue(tile, mapService, x, y) {
   var _tile$bboxPolygon, _tile$data, _tile$data2, _tile$data3;
-  var bbox = (tile === null || tile === void 0 || (_tile$bboxPolygon = tile.bboxPolygon) === null || _tile$bboxPolygon === void 0 ? void 0 : _tile$bboxPolygon.bbox) || [0, 0, 10, -10];
-  var _bbox = _slicedToArray(bbox, 4),
-    _bbox$ = _bbox[0],
-    minLng = _bbox$ === void 0 ? 0 : _bbox$,
-    _bbox$2 = _bbox[1],
-    minLat = _bbox$2 === void 0 ? 0 : _bbox$2,
-    _bbox$3 = _bbox[2],
-    maxLng = _bbox$3 === void 0 ? 10 : _bbox$3,
-    _bbox$4 = _bbox[3],
-    maxLat = _bbox$4 === void 0 ? -10 : _bbox$4;
-  var tileXY = mapService.lngLatToContainer([minLng, minLat]);
-  var tileMaxXY = mapService.lngLatToContainer([maxLng, maxLat]);
-  var tilePixelWidth = tileMaxXY.x - tileXY.x;
-  var tilePixelHeight = tileXY.y - tileMaxXY.y;
-  var pos = [(x - tileXY.x) / tilePixelWidth,
+  const bbox = (tile === null || tile === void 0 || (_tile$bboxPolygon = tile.bboxPolygon) === null || _tile$bboxPolygon === void 0 ? void 0 : _tile$bboxPolygon.bbox) || [0, 0, 10, -10];
+  const [minLng = 0, minLat = 0, maxLng = 10, maxLat = -10] = bbox;
+  const tileXY = mapService.lngLatToContainer([minLng, minLat]);
+  const tileMaxXY = mapService.lngLatToContainer([maxLng, maxLat]);
+  const tilePixelWidth = tileMaxXY.x - tileXY.x;
+  const tilePixelHeight = tileXY.y - tileMaxXY.y;
+  const pos = [(x - tileXY.x) / tilePixelWidth,
   // x
   (y - tileMaxXY.y) / tilePixelHeight // y
   ];
-  var tileWidth = (tile === null || tile === void 0 || (_tile$data = tile.data) === null || _tile$data === void 0 ? void 0 : _tile$data.width) || 1;
-  var tileHeight = (tile === null || tile === void 0 || (_tile$data2 = tile.data) === null || _tile$data2 === void 0 ? void 0 : _tile$data2.height) || 1;
-  var indexX = Math.floor(pos[0] * tileWidth);
-  var indexY = Math.floor(pos[1] * tileHeight);
-  var index = Math.max(0, indexY - 1) * tileWidth + indexX;
-  var data = tile === null || tile === void 0 || (_tile$data3 = tile.data) === null || _tile$data3 === void 0 ? void 0 : _tile$data3.data[index];
+  const tileWidth = (tile === null || tile === void 0 || (_tile$data = tile.data) === null || _tile$data === void 0 ? void 0 : _tile$data.width) || 1;
+  const tileHeight = (tile === null || tile === void 0 || (_tile$data2 = tile.data) === null || _tile$data2 === void 0 ? void 0 : _tile$data2.height) || 1;
+  const indexX = Math.floor(pos[0] * tileWidth);
+  const indexY = Math.floor(pos[1] * tileHeight);
+  const index = Math.max(0, indexY - 1) * tileWidth + indexX;
+  const data = tile === null || tile === void 0 || (_tile$data3 = tile.data) === null || _tile$data3 === void 0 ? void 0 : _tile$data3.data[index];
   return data;
 }
 export function readPixel(x, y, rendererService) {
-  var readPixels = rendererService.readPixels,
-    getViewportSize = rendererService.getViewportSize;
-  var xInDevicePixel = x * DOM.DPR;
-  var yInDevicePixel = y * DOM.DPR;
-  var _getViewportSize = getViewportSize(),
-    width = _getViewportSize.width,
-    height = _getViewportSize.height;
+  const {
+    readPixels,
+    getViewportSize
+  } = rendererService;
+  const xInDevicePixel = x * DOM.DPR;
+  const yInDevicePixel = y * DOM.DPR;
+  const {
+    width,
+    height
+  } = getViewportSize();
   if (xInDevicePixel > width - 1 * DOM.DPR || xInDevicePixel < 0 || yInDevicePixel > height - 1 * DOM.DPR || yInDevicePixel < 0) {
     return false;
   }
-  var pickedColors = readPixels({
+  const pickedColors = readPixels({
     x: Math.floor(xInDevicePixel),
     // 视口坐标系原点在左上，而 WebGL 在左下，需要翻转 Y 轴
     y: Math.floor(height - (y + 1) * DOM.DPR),

package/es/tile/interaction/utils.js

@@ -1,19 +1,14 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { decodePickingColor } from '@antv/l7-utils';
 export function clearPickState(layers) {
-  layers.filter(function (layer) {
-    return layer.inited && layer.isVisible();
-  }).filter(function (layer) {
-    return layer.getCurrentSelectedId() !== null;
-  }).map(function (layer) {
+  layers.filter(layer => layer.inited && layer.isVisible()).filter(layer => layer.getCurrentSelectedId() !== null).map(layer => {
     selectFeature(layer, new Uint8Array([0, 0, 0, 0]));
     layer.setCurrentSelectedId(null);
   });
 }
 export function setSelect(layers, pickedColors, renderList) {
-  var selectedId = decodePickingColor(pickedColors);
-  var pickColor;
-  layers.map(function (layer) {
+  const selectedId = decodePickingColor(pickedColors);
+  let pickColor;
+  layers.map(layer => {
     if (layer.getCurrentSelectedId() === null || selectedId !== layer.getCurrentSelectedId()) {
       selectFeature(layer, pickedColors);
       layer.setCurrentSelectedId(selectedId);
@@ -25,25 +20,17 @@ export function setSelect(layers, pickedColors, renderList) {
     }
   });
   // unselect normal layer
-  renderList.filter(function (layer) {
-    return layer.inited && layer.isVisible() && layer.needPick('click');
-  }).filter(function (layer) {
-    return layer.getCurrentSelectedId() !== null;
-  }).map(function (layer) {
+  renderList.filter(layer => layer.inited && layer.isVisible() && layer.needPick('click')).filter(layer => layer.getCurrentSelectedId() !== null).map(layer => {
     selectFeature(layer, new Uint8Array([0, 0, 0, 0]));
     layer.setCurrentSelectedId(null);
   });
   return pickColor;
 }
 export function setHighlight(layers, pickedColors) {
-  var pickId = decodePickingColor(pickedColors);
-  layers.filter(function (layer) {
-    return layer.inited && layer.isVisible();
-  })
+  const pickId = decodePickingColor(pickedColors);
+  layers.filter(layer => layer.inited && layer.isVisible())
   // @ts-ignore
-  .filter(function (layer) {
-    return layer.getPickID() !== pickId;
-  }).map(function (layer) {
+  .filter(layer => layer.getPickID() !== pickId).map(layer => {
     // @ts-ignore
     layer.setPickID(pickId);
     layer.hooks.beforeHighlight.call(pickedColors);
@@ -51,36 +38,31 @@ export function setHighlight(layers, pickedColors) {
 }
 export function setPickState(layers, pickColors) {
   if (pickColors.select) {
-    layers.map(function (layer) {
+    layers.map(layer => {
       selectFeature(layer, pickColors.select);
     });
   }
   if (pickColors.active) {
-    layers.filter(function (layer) {
-      return layer.inited && layer.isVisible();
-    }).map(function (layer) {
+    layers.filter(layer => layer.inited && layer.isVisible()).map(layer => {
       layer.hooks.beforeHighlight.call(pickColors.active);
     });
   }
 }
 export function selectFeature(layer, pickedColors) {
   // @ts-ignore
-  var _pickedColors = _slicedToArray(pickedColors, 3),
-    r = _pickedColors[0],
-    g = _pickedColors[1],
-    b = _pickedColors[2];
+  const [r, g, b] = pickedColors;
   layer.hooks.beforeSelect.call([r, g, b]);
 }
 export function setFeatureSelect(color, layers) {
-  var id = decodePickingColor(color);
-  layers.map(function (layer) {
+  const id = decodePickingColor(color);
+  layers.map(layer => {
     selectFeature(layer, color);
     layer.setCurrentSelectedId(id);
   });
 }
 export function setFeatureActive(color, layers) {
-  var id = decodePickingColor(color);
-  layers.map(function (layer) {
+  const id = decodePickingColor(color);
+  layers.map(layer => {
     layer.hooks.beforeHighlight.call(color);
     layer.setCurrentPickId(id);
   });

package/es/tile/service/TileLayerService.js

@@ -1,196 +1,123 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-export var TileLayerService = /*#__PURE__*/function () {
-  function TileLayerService(_ref) {
-    var rendererService = _ref.rendererService,
-      layerService = _ref.layerService,
-      parent = _ref.parent;
-    _classCallCheck(this, TileLayerService);
+export class TileLayerService {
+  constructor({
+    rendererService,
+    layerService,
+    parent
+  }) {
     /**
      * tileResource 用于存储瓦片的全局资源
      */
     _defineProperty(this, "tileResource", new Map());
+    _defineProperty(this, "rendererService", void 0);
+    _defineProperty(this, "layerService", void 0);
+    _defineProperty(this, "parent", void 0);
     _defineProperty(this, "layerTiles", []);
     this.rendererService = rendererService;
     this.layerService = layerService;
     this.parent = parent;
   }
-  _createClass(TileLayerService, [{
-    key: "tiles",
-    get: function get() {
-      return this.layerTiles;
-    }
-  }, {
-    key: "hasTile",
-    value: function hasTile(tileKey) {
-      return this.layerTiles.some(function (tile) {
-        return tile.key === tileKey;
-      });
-    }
-  }, {
-    key: "addTile",
-    value: function addTile(tile) {
-      this.layerTiles.push(tile);
-    }
-  }, {
-    key: "getTile",
-    value: function getTile(tileKey) {
-      return this.layerTiles.find(function (tile) {
-        return tile.key === tileKey;
-      });
-    }
-  }, {
-    key: "getVisibleTileBylngLat",
-    value: function getVisibleTileBylngLat(lngLat) {
-      // 加载完成 & 可见 & 鼠标选中
-      return this.layerTiles.find(function (tile) {
-        return tile.isLoaded && tile.visible && tile.lnglatInBounds(lngLat);
-      });
-    }
-  }, {
-    key: "removeTile",
-    value: function removeTile(tileKey) {
-      var index = this.layerTiles.findIndex(function (t) {
-        return t.key === tileKey;
-      });
-      var tile = this.layerTiles.splice(index, 1);
-      if (tile[0]) {
-        tile[0].destroy();
-      }
+  get tiles() {
+    return this.layerTiles;
+  }
+  hasTile(tileKey) {
+    return this.layerTiles.some(tile => tile.key === tileKey);
+  }
+  addTile(tile) {
+    this.layerTiles.push(tile);
+  }
+  getTile(tileKey) {
+    return this.layerTiles.find(tile => tile.key === tileKey);
+  }
+  getVisibleTileBylngLat(lngLat) {
+    // 加载完成 & 可见 & 鼠标选中
+    return this.layerTiles.find(tile => tile.isLoaded && tile.visible && tile.lnglatInBounds(lngLat));
+  }
+  removeTile(tileKey) {
+    const index = this.layerTiles.findIndex(t => t.key === tileKey);
+    const tile = this.layerTiles.splice(index, 1);
+    if (tile[0]) {
+      tile[0].destroy();
     }
-  }, {
-    key: "updateTileVisible",
-    value: function updateTileVisible(sourceTile) {
-      var tile = this.getTile(sourceTile.key);
-      if (sourceTile.isVisible) {
-        // 不可见 => 可见 兄弟节点加载完成
-        if (sourceTile.parent) {
-          var flag = this.isChildrenLoaded(sourceTile.parent);
-          tile === null || tile === void 0 || tile.updateVisible(flag);
-        } else {
-          tile === null || tile === void 0 || tile.updateVisible(true);
-        }
+  }
+  updateTileVisible(sourceTile) {
+    const tile = this.getTile(sourceTile.key);
+    if (sourceTile.isVisible) {
+      // 不可见 => 可见 兄弟节点加载完成
+      if (sourceTile.parent) {
+        const flag = this.isChildrenLoaded(sourceTile.parent);
+        tile === null || tile === void 0 || tile.updateVisible(flag);
       } else {
-        // 可见 => 不可见 兄弟节点加载完成
-        if (sourceTile.parent) {
-          var _flag = this.isChildrenLoaded(sourceTile.parent);
-          tile === null || tile === void 0 || tile.updateVisible(!_flag);
-        } else {
-          tile === null || tile === void 0 || tile.updateVisible(false);
-        }
-      }
-    }
-  }, {
-    key: "isParentLoaded",
-    value: function isParentLoaded(sourceTile) {
-      var parentTile = sourceTile.parent;
-      if (!parentTile) {
-        return true;
-      }
-      var tile = this.getTile(parentTile === null || parentTile === void 0 ? void 0 : parentTile.key);
-      if (tile !== null && tile !== void 0 && tile.isLoaded) {
-        // 递归父级
-        return true;
-      }
-      return false;
-    }
-  }, {
-    key: "isChildrenLoaded",
-    value: function isChildrenLoaded(sourceTile) {
-      var _this = this;
-      var childrenTile = sourceTile === null || sourceTile === void 0 ? void 0 : sourceTile.children;
-      if (childrenTile.length === 0) {
-        return true;
+        tile === null || tile === void 0 || tile.updateVisible(true);
       }
-      return childrenTile.every(function (tile) {
-        var tileLayer = _this.getTile(tile === null || tile === void 0 ? void 0 : tile.key);
-        if (!tileLayer) {
-          return true;
-        }
-        return (tileLayer === null || tileLayer === void 0 ? void 0 : tileLayer.isLoaded) === true;
-      });
-    }
-  }, {
-    key: "render",
-    value: function () {
-      var _render = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _this2 = this;
-        var layers, renders;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              layers = this.getRenderLayers();
-              renders = layers.map( /*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
-                  return _regeneratorRuntime.wrap(function _callee$(_context) {
-                    while (1) switch (_context.prev = _context.next) {
-                      case 0:
-                        _context.next = 2;
-                        return _this2.layerService.renderTileLayer(layer);
-                      case 2:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }, _callee);
-                }));
-                return function (_x) {
-                  return _ref2.apply(this, arguments);
-                };
-              }());
-              _context2.next = 4;
-              return Promise.all(renders);
-            case 4:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function render() {
-        return _render.apply(this, arguments);
+    } else {
+      // 可见 => 不可见 兄弟节点加载完成
+      if (sourceTile.parent) {
+        const flag = this.isChildrenLoaded(sourceTile.parent);
+        tile === null || tile === void 0 || tile.updateVisible(!flag);
+      } else {
+        tile === null || tile === void 0 || tile.updateVisible(false);
       }
-      return render;
-    }()
-  }, {
-    key: "getRenderLayers",
-    value: function getRenderLayers() {
-      var tileList = this.layerTiles.filter(function (t) {
-        return t.visible && t.isLoaded;
-      });
-      var layers = [];
-      tileList.map(function (tile) {
-        return layers.push.apply(layers, _toConsumableArray(tile.getLayers()));
-      });
-      return layers;
     }
-  }, {
-    key: "getLayers",
-    value: function getLayers() {
-      var tileList = this.layerTiles.filter(function (t) {
-        return t.isLoaded;
-      });
-      var layers = [];
-      tileList.map(function (tile) {
-        return layers.push.apply(layers, _toConsumableArray(tile.getLayers()));
-      });
-      return layers;
+  }
+  isParentLoaded(sourceTile) {
+    const parentTile = sourceTile.parent;
+    if (!parentTile) {
+      return true;
     }
-  }, {
-    key: "getTiles",
-    value: function getTiles() {
-      return this.layerTiles;
+    const tile = this.getTile(parentTile === null || parentTile === void 0 ? void 0 : parentTile.key);
+    if (tile !== null && tile !== void 0 && tile.isLoaded) {
+      // 递归父级
+      return true;
     }
-  }, {
-    key: "destroy",
-    value: function destroy() {
-      this.layerTiles.forEach(function (t) {
-        return t.destroy();
-      });
-      this.tileResource.clear();
+    return false;
+  }
+  isChildrenLoaded(sourceTile) {
+    const childrenTile = sourceTile === null || sourceTile === void 0 ? void 0 : sourceTile.children;
+    if (childrenTile.length === 0) {
+      return true;
     }
-  }]);
-  return TileLayerService;
-}();
+    return childrenTile.every(tile => {
+      const tileLayer = this.getTile(tile === null || tile === void 0 ? void 0 : tile.key);
+      if (!tileLayer) {
+        return true;
+      }
+      return (tileLayer === null || tileLayer === void 0 ? void 0 : tileLayer.isLoaded) === true;
+    });
+  }
+  render() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      const layers = _this.getRenderLayers();
+      const renders = layers.map( /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator(function* (layer) {
+          yield _this.layerService.renderTileLayer(layer);
+        });
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+      yield Promise.all(renders);
+    })();
+  }
+  getRenderLayers() {
+    const tileList = this.layerTiles.filter(t => t.visible && t.isLoaded);
+    const layers = [];
+    tileList.map(tile => layers.push(...tile.getLayers()));
+    return layers;
+  }
+  getLayers() {
+    const tileList = this.layerTiles.filter(t => t.isLoaded);
+    const layers = [];
+    tileList.map(tile => layers.push(...tile.getLayers()));
+    return layers;
+  }
+  getTiles() {
+    return this.layerTiles;
+  }
+  destroy() {
+    this.layerTiles.forEach(t => t.destroy());
+    this.tileResource.clear();
+  }
+}