@antv/l7-layers 2.9.36-alpha.1 → 2.9.37-alpha.1

package/lib/tile/utils.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,28 +7,35 @@ exports.getContainerSize = getContainerSize;
 exports.getLayerShape = getLayerShape;
 exports.getMaskValue = getMaskValue;
 exports.isTileChildLoaded = isTileChildLoaded;
+exports.isTileGroup = isTileGroup;
 exports.isTileLoaded = isTileLoaded;
 exports.isTileParentLoaded = isTileParentLoaded;
 exports.isVectorTile = isVectorTile;
-exports.readPixel = readPixel;
-exports.readRasterValue = readRasterValue;
 exports.registerLayers = registerLayers;
 exports.tileAllLoad = tileAllLoad;
 exports.tileVectorParser = void 0;
-exports.updateLayersConfig = updateLayersConfig;
 exports.updateTileVisible = updateTileVisible;
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _l7Core = require("@antv/l7-core");
 
 var _l7Utils = require("@antv/l7-utils");
 
+var _utils = require("./style/utils");
+
 var tileVectorParser = ['mvt', 'geojsonvt', 'testTile'];
+/**
+ * 判断当前图层是否是瓦片图层
+ * @param layer
+ * @returns
+ */
+
 exports.tileVectorParser = tileVectorParser;
 
+function isTileGroup(layer) {
+  var source = layer.getSource();
+  return tileVectorParser.includes(source.parser.type);
+}
+
 function isVectorTile(parserType) {
   return tileVectorParser.indexOf(parserType) >= 0;
 }
@@ -106,74 +111,15 @@ function getContainerSize(container) {
   }
 }
 
-function readRasterValue(tile, mapService, x, y) {
-  var _tile$bboxPolygon, _tile$data, _tile$data2, _tile$data3;
-
-  var bbox = (tile === null || tile === void 0 ? void 0 : (_tile$bboxPolygon = tile.bboxPolygon) === null || _tile$bboxPolygon === void 0 ? void 0 : _tile$bboxPolygon.bbox) || [0, 0, 10, -10];
-
-  var _bbox = (0, _slicedToArray2.default)(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, // x
-  (y - tileMaxXY.y) / tilePixelHeight // y
-  ];
-  var tileWidth = (tile === null || tile === void 0 ? void 0 : (_tile$data = tile.data) === null || _tile$data === void 0 ? void 0 : _tile$data.width) || 1;
-  var tileHeight = (tile === null || tile === void 0 ? 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 ? void 0 : (_tile$data3 = tile.data) === null || _tile$data3 === void 0 ? void 0 : _tile$data3.data[index];
-  return data;
-}
-
-function readPixel(x, y, rendererService) {
-  var readPixels = rendererService.readPixels,
-      getContainer = rendererService.getContainer;
-  var xInDevicePixel = x * _l7Utils.DOM.DPR;
-  var yInDevicePixel = y * _l7Utils.DOM.DPR;
-
-  var _getContainerSize = getContainerSize(getContainer()),
-      width = _getContainerSize.width,
-      height = _getContainerSize.height;
-
-  width *= _l7Utils.DOM.DPR;
-  height *= _l7Utils.DOM.DPR;
-
-  if (xInDevicePixel > width - 1 * _l7Utils.DOM.DPR || xInDevicePixel < 0 || yInDevicePixel > height - 1 * _l7Utils.DOM.DPR || yInDevicePixel < 0) {
-    return false;
-  }
-
-  var pickedColors = readPixels({
-    x: Math.floor(xInDevicePixel),
-    // 视口坐标系原点在左上，而 WebGL 在左下，需要翻转 Y 轴
-    y: Math.floor(height - (y + 1) * _l7Utils.DOM.DPR),
-    width: 1,
-    height: 1,
-    data: new Uint8Array(1 * 1 * 4)
-  });
-  return pickedColors;
-}
-
 function isTileLoaded(tile) {
   return tile.layerIDList.length === tile.loadedLayers;
 }
 
 function isTileChildLoaded(tile) {
-  var childs = tile.children;
-  return childs.filter(function (child) {
+  var children = tile.children;
+  return children.filter(function (child) {
     return isTileLoaded(child);
-  }).length === childs.length;
+  }).length === children.length;
 }
 
 function isTileParentLoaded(tile) {
@@ -199,19 +145,6 @@ function tileAllLoad(tile, callback) {
   }, 36);
 }
 
-function updateLayersConfig(layers, key, value) {
-  layers.map(function (layer) {
-    if (key === 'mask') {
-      // Tip: 栅格瓦片生效、设置全局的 mask、瓦片被全局的 mask 影响
-      layer.style({
-        mask: value
-      });
-    } else {
-      layer.updateLayerConfig((0, _defineProperty2.default)({}, key, value));
-    }
-  });
-}
-
 function dispatchTileVisibleChange(tile, callback) {
   if (tile.isVisible) {
     callback();
@@ -236,13 +169,13 @@ function updateTileVisible(tile, layers, layerService) {
   if (layers.length === 0) return;
 
   if (updateImmediately(layers)) {
-    updateLayersConfig(layers, 'visible', tile.isVisible);
+    (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
     layerService.reRender();
     return;
   }
 
   dispatchTileVisibleChange(tile, function () {
-    updateLayersConfig(layers, 'visible', tile.isVisible);
+    (0, _utils.updateLayersConfig)(layers, 'visible', tile.isVisible);
     layerService.reRender();
   });
 }

package/lib/utils/dataMappingStyle.js

@@ -9,15 +9,12 @@ exports.handleStyleFloat = handleStyleFloat;
 
 var _lodash = require("lodash");
 
-// 画布默认的宽度
-var WIDTH = 1024;
 /**
  * 当 style 中使用的 opacity 不是常数的时候根据数据进行映射
  * @param field
  * @param values
  * @param updateOptions
  */
-
 function registerStyleAttribute(fieldName, layer, field, values, updateOptions) {
   layer.updateStyleAttribute(fieldName, field, values, updateOptions);
 }

package/lib/utils/extrude_polyline.js

@@ -9,6 +9,7 @@ exports.computeMiter = computeMiter;
 exports.computeNormal = computeNormal;
 exports.default = void 0;
 exports.direction = direction;
+exports.getArrayUnique = getArrayUnique;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
@@ -24,7 +25,8 @@ var _l7Utils = require("@antv/l7-utils");
 
 var _glMatrix = require("gl-matrix");
 
-var tmp = _glMatrix.vec2.create();
+var tmp = _glMatrix.vec2.create(); // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
 
 var capEnd = _glMatrix.vec2.create();
 
@@ -336,7 +338,8 @@ var ExtrudePolyline = /*#__PURE__*/function () {
     }
   }, {
     key: "segment_gaode2",
-    value: function segment_gaode2(complex, index, last, cur, next, originLast, originCur, originNext) {
+    value: function segment_gaode2(complex, index, last, cur, next, originLast, originCur, // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    originNext) {
       var count = 0;
       var indices = complex.indices;
       var positions = complex.positions;

package/lib/utils/multiPassRender.js

@@ -32,7 +32,6 @@ function createMultiPassRenderer(layer, passes, postProcessingPassFactory, norma
   var multiPassRenderer = layer.multiPassRenderer;
 
   var _layer$getLayerConfig = layer.getLayerConfig(),
-      enablePicking = _layer$getLayerConfig.enablePicking,
       enableTAA = _layer$getLayerConfig.enableTAA; // picking pass if enabled
   // if (enablePicking) {
   //   multiPassRenderer.add(normalPassFactory('pixelPicking'));

package/lib/wind/index.js

@@ -77,19 +77,6 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
 
       return this;
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "getDefaultConfig",
     value: function getDefaultConfig() {

package/lib/wind/models/wind.js

@@ -177,8 +177,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
           enable: false
         },
         stencil: (0, _l7Utils.getMask)(mask, maskInside),
-        blend: this.getBlend(),
-        pick: false
+        blend: this.getBlend()
       }).then(function (model) {
         _this3.colorModel = model;
         callbackModel([model]);
@@ -212,19 +211,6 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
       (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
       (_this$wind = this.wind) === null || _this$wind === void 0 ? void 0 : _this$wind.destroy();
     }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
-        }
-      };
-    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.36-alpha.1",
+  "version": "2.9.37-alpha.1",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.2",
-    "@antv/l7-core": "2.9.36-alpha.1",
-    "@antv/l7-maps": "2.9.36-alpha.1",
-    "@antv/l7-source": "2.9.36-alpha.1",
-    "@antv/l7-utils": "2.9.36-alpha.1",
+    "@antv/l7-core": "2.9.37-alpha.1",
+    "@antv/l7-maps": "2.9.37-alpha.1",
+    "@antv/l7-source": "2.9.37-alpha.1",
+    "@antv/l7-utils": "2.9.37-alpha.1",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "dafb82e5eb2cf73db95d8dbdcef63d4ad5f99554",
+  "gitHead": "6ac153816c5f28967f71888c2a3e9684eb6e7be8",
   "publishConfig": {
     "access": "public"
   }

package/es/tile/manager/tileLayerManager.d.ts

@@ -1,15 +0,0 @@
-import { IInteractionTarget, ILayer, IMapService, IPickingService, IRendererService, ITileLayerManager, ITilePickManager, ITransform } from '@antv/l7-core';
-import { TileManager } from './baseTileManager';
-import { ITileConfigManager } from './tileConfigManager';
-export declare class TileLayerManager extends TileManager implements ITileLayerManager {
-    tilePickManager: ITilePickManager;
-    tileConfigManager: ITileConfigManager;
-    private transforms;
-    constructor(parent: ILayer, mapService: IMapService, rendererService: IRendererService, pickingService: IPickingService, transforms: ITransform[]);
-    render(): void;
-    pickLayers(target: IInteractionTarget): boolean;
-    private setSubLayerInitOption;
-    private setConfigListener;
-    private updateStyle;
-    destroy(): void;
-}

package/es/tile/manager/tilePickerManager.d.ts

@@ -1,21 +0,0 @@
-import { IInteractionTarget, ILayer, IPickingService, IRendererService, ITilePickManager } from '@antv/l7-core';
-import { EventEmitter } from 'eventemitter3';
-export default class TilePickManager extends EventEmitter implements ITilePickManager {
-    isLastPicked: boolean;
-    private rendererService;
-    private pickingService;
-    private children;
-    private parent;
-    constructor(parent: ILayer, rendererService: IRendererService, pickingService: IPickingService, children: ILayer[]);
-    /**
-     *
-     * @param layers
-     */
-    normalRender(layers: ILayer[]): void;
-    pickRender(layers: ILayer[], target: IInteractionTarget): boolean;
-    clearPick(): void;
-    beforeHighlight(pickedColors: any): void;
-    beforeSelect(pickedColors: any): void;
-    protected renderMask(layer: ILayer): void;
-    destroy(): void;
-}

package/es/tile/tileFactory/rasterDataLayer.d.ts

@@ -1,20 +0,0 @@
-import BaseLayer from '../../core/BaseLayer';
-import { IRasterLayerStyleOptions } from '../../core/interface';
-import RasterModel from '../../raster/models/rasterTile';
-import RasterRgbModel from '../../raster/models/rasterRgb';
-export default class RasterTiffLayer extends BaseLayer<Partial<IRasterLayerStyleOptions>> {
-    type: string;
-    buildModels(): void;
-    rebuildModels(): void;
-    protected getModelType(): typeof RasterModel | typeof RasterRgbModel;
-    protected getConfigSchema(): {
-        properties: {
-            opacity: {
-                type: string;
-                minimum: number;
-                maximum: number;
-            };
-        };
-    };
-    protected getDefaultConfig(): {};
-}

package/es/tile/tileLayer/baseTileLayer.d.ts

@@ -1,48 +0,0 @@
-import { IInteractionTarget, ILayer, ILayerService, IMapService, ITileLayer, ITileLayerManager, ITileLayerOPtions } from '@antv/l7-core';
-import { Tile, TilesetManager } from '@antv/l7-utils';
-export default class BaseTileLayer implements ITileLayer {
-    get children(): ILayer[];
-    type: string;
-    sourceLayer: string;
-    parent: ILayer;
-    initedTileset: boolean;
-    tilesetManager: TilesetManager | undefined;
-    tileLayerManager: ITileLayerManager;
-    scaleField: any;
-    private lastViewStates;
-    protected mapService: IMapService;
-    protected layerService: ILayerService;
-    private pickColors;
-    constructor({ parent, rendererService, mapService, layerService, pickingService, transforms }: ITileLayerOPtions);
-    /**
-     * 渲染瓦片的图层
-     */
-    render(): void;
-    clearPick(type: string): void;
-    /**
-     * 清除 select 的选中状态
-     */
-    clearPickState(): void;
-    /**
-     * 瓦片图层独立的拾取逻辑
-     * @param target
-     * @returns
-     */
-    pickLayers(target: IInteractionTarget): boolean;
-    tileLoaded(tile: Tile): void;
-    tileError(error: Error): void;
-    tileUnLoad(tile: Tile): void;
-    tileUpdate(): void;
-    protected setPickState(layers: ILayer[]): void;
-    private bindSubLayerPick;
-    private setHighlight;
-    private setSelect;
-    private selectFeature;
-    private bindSubLayerEvent;
-    private initTileSetManager;
-    private mapchange;
-    private bindTilesetEvent;
-    viewchange: import("lodash").DebouncedFunc<() => void>;
-    private getCurrentView;
-    destroy(): void;
-}