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

package/es/polygon/shaders/water/polygon_ocean_vert.glsl

@@ -4,44 +4,13 @@ uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 
 varying vec2 v_uv;
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
 
 #pragma include "projection"
 
 void main() {
   v_uv = a_uv;
-  // cal style mapping - 数据纹理映射部分的计算
-styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]
-    0.0, 0.0, 0.0, 0.0
-  );
-
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
-  // cal style mapping - 数据纹理映射部分的计算
 
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));

package/es/polygon/shaders/water/polygon_water_frag.glsl

@@ -5,8 +5,6 @@ uniform float u_opacity: 1.0;
 
 varying vec4 v_Color;
 varying vec2 v_uv;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
-
 
 float rand(vec2 n) { return 0.5 + 0.5 * fract(sin(dot(n.xy, vec2(12.9898, 78.233)))* 43758.5453); }
 
@@ -64,7 +62,7 @@ float calSpc() {
 }
 
 void main() {
-  float opacity = styleMappingMat[0][0];
+  float opacity = u_opacity;
   gl_FragColor = v_Color;
   gl_FragColor.a *= opacity;
 

package/es/polygon/shaders/water/polygon_water_vert.glsl

@@ -7,44 +7,15 @@ uniform mat4 u_Mvp;
 varying vec4 v_Color;
 varying vec2 v_uv;
 uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
 
 #pragma include "projection"
 
 void main() {
   v_uv = a_uv;
-  // cal style mapping - 数据纹理映射部分的计算
-styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]
-    0.0, 0.0, 0.0, 0.0
-  );
-
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
-  // cal style mapping - 数据纹理映射部分的计算
 
   v_Color = a_Color;
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));

package/es/raster/buffers/triangulation.js

@@ -1,10 +1,7 @@
 // @ts-ignore
 import Martini from '@mapbox/martini';
 export function RasterTriangulation(parserData) {
-  var coordinates = parserData.coordinates,
-      data = parserData.data,
-      min = parserData.min,
-      max = parserData.max,
+  var data = parserData.data,
       width = parserData.width,
       height = parserData.height;
   var maxlength = Math.max(width, height);

package/es/raster/index.js

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

package/es/raster/models/raster.js

@@ -100,7 +100,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         depth: {
           enable: false
         },
-        stencil: getMask(mask, maskInside)
+        stencil: getMask(mask, maskInside),
+        pick: false
       }).then(function (model) {
         callbackModel([model]);
       }).catch(function (err) {
@@ -137,7 +138,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
             type: gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }

package/es/shader/minify_frag.glsl

@@ -0,0 +1,7 @@
+uniform float u_opacity : 1.0;
+uniform vec4 u_color;
+
+void main() {
+  gl_FragColor = u_color;
+  gl_FragColor.a *= u_opacity;
+}

package/es/shader/minify_picking_frag.glsl

@@ -0,0 +1,10 @@
+uniform float u_opacity : 1.0;
+varying vec4 v_color;
+
+#pragma include "picking"
+
+void main() {
+  gl_FragColor = v_color;
+  gl_FragColor.a *= u_opacity;
+  gl_FragColor = filterColor(gl_FragColor);
+}

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

@@ -0,0 +1,29 @@
+import { ILayer, IMapService, IRendererService, IBaseTileLayerManager } from '@antv/l7-core';
+import { Tile } from '@antv/l7-utils';
+export declare class BaseMapTileLayerManager implements IBaseTileLayerManager {
+    sourceLayer: string;
+    parent: ILayer;
+    children: ILayer[];
+    mapService: IMapService;
+    rendererService: IRendererService;
+    private tileFactory;
+    private initOptions;
+    constructor(parent: ILayer, mapService: IMapService, rendererService: IRendererService);
+    createTile(tile: Tile): {
+        layers: ILayer[];
+        layerIDList: string[];
+    };
+    updateLayersConfig(layers: ILayer[], key: string, value: any): void;
+    addChild(layer: ILayer): void;
+    addChilds(layers: ILayer[]): void;
+    removeChilds(layerIDList: string[], refresh?: boolean): void;
+    removeChild(layer: ILayer): void;
+    getChilds(layerIDList: string[]): ILayer[];
+    getChild(layerID: string): ILayer;
+    clearChild(): void;
+    hasChild(layer: ILayer): boolean;
+    render(): void;
+    private setSubLayerInitOptipn;
+    private getSourceLayer;
+    private initTileFactory;
+}

package/es/tile/manager/baseMapTileLayerManager.js

@@ -0,0 +1,207 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import { getTileFactory } from "../tileFactory";
+import { getLayerShape, getMaskValue } from "../utils";
+export var BaseMapTileLayerManager = /*#__PURE__*/function () {
+  // only support vector layer
+  function BaseMapTileLayerManager(parent, mapService, rendererService) {
+    _classCallCheck(this, BaseMapTileLayerManager);
+
+    this.parent = parent;
+    this.children = parent.layerChildren;
+    this.mapService = mapService;
+    this.rendererService = rendererService;
+    this.setSubLayerInitOptipn();
+    this.initTileFactory();
+  }
+
+  _createClass(BaseMapTileLayerManager, [{
+    key: "createTile",
+    value: function createTile(tile) {
+      return this.tileFactory.createTile(tile, this.initOptions);
+    }
+  }, {
+    key: "updateLayersConfig",
+    value: function updateLayersConfig(layers, key, value) {
+      layers.map(function (layer) {
+        if (key === 'mask') {
+          // Tip: 栅格瓦片生效、设置全局的 mask、瓦片被全局的 mask 影响
+          layer.style({
+            mask: value
+          });
+        } else {
+          layer.updateLayerConfig(_defineProperty({}, key, value));
+        }
+      });
+    }
+  }, {
+    key: "addChild",
+    value: function addChild(layer) {
+      this.children.push(layer);
+    }
+  }, {
+    key: "addChilds",
+    value: function addChilds(layers) {
+      var _this$children;
+
+      (_this$children = this.children).push.apply(_this$children, _toConsumableArray(layers));
+    }
+  }, {
+    key: "removeChilds",
+    value: function removeChilds(layerIDList) {
+      var refresh = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var remveLayerList = [];
+      var cacheLayerList = [];
+      this.children.filter(function (child) {
+        layerIDList.includes(child.id) ? remveLayerList.push(child) : cacheLayerList.push(child);
+      });
+      remveLayerList.map(function (layer) {
+        return layer.destroy(refresh);
+      });
+      this.children = cacheLayerList;
+    }
+  }, {
+    key: "removeChild",
+    value: function removeChild(layer) {
+      var layerIndex = this.children.indexOf(layer);
+
+      if (layerIndex > -1) {
+        this.children.splice(layerIndex, 1);
+      }
+
+      layer.destroy();
+    }
+  }, {
+    key: "getChilds",
+    value: function getChilds(layerIDList) {
+      return this.children.filter(function (child) {
+        return layerIDList.includes(child.id);
+      });
+    }
+  }, {
+    key: "getChild",
+    value: function getChild(layerID) {
+      return this.children.filter(function (child) {
+        return child.id === layerID;
+      })[0];
+    }
+  }, {
+    key: "clearChild",
+    value: function clearChild() {
+      this.children.forEach(function (layer) {
+        layer.destroy();
+      });
+      this.children.slice(0, this.children.length);
+    }
+  }, {
+    key: "hasChild",
+    value: function hasChild(layer) {
+      return this.children.includes(layer);
+    }
+  }, {
+    key: "render",
+    value: function render() {
+      var _this = this;
+
+      this.children.filter(function (layer) {
+        return layer.inited;
+      }).filter(function (layer) {
+        return layer.isVisible();
+      }).map(function (layer) {
+        layer.hooks.beforeRenderData.call();
+        layer.hooks.beforeRender.call();
+
+        if (layer.masks.length > 0) {
+          // 清除上一次的模版缓存
+          _this.rendererService.clear({
+            stencil: 0,
+            depth: 1,
+            framebuffer: null
+          });
+
+          layer.masks.map(function (m) {
+            m.hooks.beforeRenderData.call();
+            m.hooks.beforeRender.call();
+            m.render();
+            m.hooks.afterRender.call();
+          });
+        }
+
+        layer.render();
+        layer.hooks.afterRender.call();
+      });
+    }
+  }, {
+    key: "setSubLayerInitOptipn",
+    value: function setSubLayerInitOptipn() {
+      var _colorAttribute$scale, _sizeAttribute$scale;
+
+      var _ref = this.parent.getLayerConfig(),
+          _ref$zIndex = _ref.zIndex,
+          zIndex = _ref$zIndex === void 0 ? 0 : _ref$zIndex,
+          _ref$opacity = _ref.opacity,
+          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+          _ref$mask = _ref.mask,
+          mask = _ref$mask === void 0 ? false : _ref$mask,
+          _ref$stroke = _ref.stroke,
+          stroke = _ref$stroke === void 0 ? '#fff' : _ref$stroke,
+          _ref$strokeWidth = _ref.strokeWidth,
+          strokeWidth = _ref$strokeWidth === void 0 ? 0 : _ref$strokeWidth,
+          _ref$strokeOpacity = _ref.strokeOpacity,
+          strokeOpacity = _ref$strokeOpacity === void 0 ? 1 : _ref$strokeOpacity,
+          _ref$workerEnabled = _ref.workerEnabled,
+          workerEnabled = _ref$workerEnabled === void 0 ? false : _ref$workerEnabled,
+          sourceLayer = _ref.sourceLayer;
+
+      var source = this.parent.getSource();
+      var parentParserType = source.getParserType();
+      var colorAttribute = this.parent.getAttribute('color');
+      var basemapColor = (colorAttribute === null || colorAttribute === void 0 ? void 0 : (_colorAttribute$scale = colorAttribute.scale) === null || _colorAttribute$scale === void 0 ? void 0 : _colorAttribute$scale.field) || '#fff';
+      var sizeAttribute = this.parent.getAttribute('size');
+      var basemapSize = (sizeAttribute === null || sizeAttribute === void 0 ? void 0 : (_sizeAttribute$scale = sizeAttribute.scale) === null || _sizeAttribute$scale === void 0 ? void 0 : _sizeAttribute$scale.field) || 1;
+      var layerShape = getLayerShape(this.parent.type, this.parent);
+      this.initOptions = {
+        usage: 'basemap',
+        layerType: this.parent.type,
+        shape: layerShape,
+        zIndex: zIndex,
+        opacity: opacity,
+        sourceLayer: this.getSourceLayer(parentParserType, sourceLayer),
+        basemapColor: basemapColor,
+        basemapSize: basemapSize,
+        mask: getMaskValue(this.parent.type, mask),
+        stroke: stroke,
+        strokeWidth: strokeWidth,
+        strokeOpacity: strokeOpacity,
+        // worker
+        workerEnabled: workerEnabled
+      };
+    }
+  }, {
+    key: "getSourceLayer",
+    value: function getSourceLayer(parentParserType, sourceLayer) {
+      if (parentParserType === 'geojsonvt') {
+        return 'geojsonvt';
+      } else if (parentParserType === 'testTile') {
+        return 'testTile';
+      } else {
+        return sourceLayer;
+      }
+    }
+  }, {
+    key: "initTileFactory",
+    value: function initTileFactory() {
+      var source = this.parent.getSource();
+      var TileFactory = getTileFactory(this.parent.type, source.parser);
+      this.tileFactory = new TileFactory({
+        parent: this.parent,
+        mapService: this.mapService,
+        rendererService: this.rendererService
+      });
+    }
+  }]);
+
+  return BaseMapTileLayerManager;
+}();

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

@@ -1,4 +1,4 @@
-import { IInteractionTarget, ILayer, ILayerService, IMapService, IPickingService, IRendererService, ITileLayerManager, ITilePickManager, ITransform } from '@antv/l7-core';
+import { IInteractionTarget, ILayer, IMapService, IPickingService, IRendererService, ITileLayerManager, ITilePickManager, ITransform } from '@antv/l7-core';
 import { Tile } from '@antv/l7-utils';
 import { ITileConfigManager } from './tileConfigManager';
 export declare class TileLayerManager implements ITileLayerManager {
@@ -13,7 +13,7 @@ export declare class TileLayerManager implements ITileLayerManager {
     private initOptions;
     private rampColorsData;
     private transforms;
-    constructor(parent: ILayer, mapService: IMapService, rendererService: IRendererService, pickingService: IPickingService, layerService: ILayerService, transforms: ITransform[]);
+    constructor(parent: ILayer, mapService: IMapService, rendererService: IRendererService, pickingService: IPickingService, transforms: ITransform[]);
     createTile(tile: Tile): {
         layers: ILayer[];
         layerIDList: string[];

package/es/tile/manager/tileLayerManager.js

@@ -8,7 +8,7 @@ import { getLayerShape, getMaskValue } from "../utils";
 import TileConfigManager from "./tileConfigManager";
 import TilePickManager from "./tilePickerManager";
 export var TileLayerManager = /*#__PURE__*/function () {
-  function TileLayerManager(parent, mapService, rendererService, pickingService, layerService, transforms) {
+  function TileLayerManager(parent, mapService, rendererService, pickingService, transforms) {
     _classCallCheck(this, TileLayerManager);
 
     this.parent = parent;
@@ -16,7 +16,7 @@ export var TileLayerManager = /*#__PURE__*/function () {
     this.mapService = mapService;
     this.rendererService = rendererService;
     this.transforms = transforms;
-    this.tilePickManager = new TilePickManager(parent, rendererService, pickingService, this.children, layerService);
+    this.tilePickManager = new TilePickManager(parent, rendererService, pickingService, this.children);
     this.tileConfigManager = new TileConfigManager();
     this.setSubLayerInitOptipn();
     this.setConfigListener();

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

@@ -1,13 +1,12 @@
-import { IInteractionTarget, ILayer, ILayerService, IPickingService, IRendererService, ITilePickManager } from '@antv/l7-core';
+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 layerService;
     private children;
     private parent;
-    constructor(parent: ILayer, rendererService: IRendererService, pickingService: IPickingService, children: ILayer[], layerService: ILayerService);
+    constructor(parent: ILayer, rendererService: IRendererService, pickingService: IPickingService, children: ILayer[]);
     /**
      *
      * @param layers

package/es/tile/manager/tilePickerManager.js

@@ -17,7 +17,7 @@ var TilePickManager = /*#__PURE__*/function (_EventEmitter) {
 
   var _super = _createSuper(TilePickManager);
 
-  function TilePickManager(parent, rendererService, pickingService, children, layerService) {
+  function TilePickManager(parent, rendererService, pickingService, children) {
     var _this;
 
     _classCallCheck(this, TilePickManager);
@@ -29,7 +29,6 @@ var TilePickManager = /*#__PURE__*/function (_EventEmitter) {
     _this.parent = parent;
     _this.rendererService = rendererService;
     _this.pickingService = pickingService;
-    _this.layerService = layerService;
     _this.children = children;
     return _this;
   }

package/es/tile/models/tileModel.d.ts

@@ -2,6 +2,7 @@ import { IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class TileModel extends BaseModel {
     getUninforms(): IModelUniform;
+    private getTileLayer;
     initModels(): never[];
     buildModels(): never[];
     protected registerBuiltinAttributes(): void;

package/es/tile/models/tileModel.js

@@ -10,6 +10,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import BaseModel from "../../core/BaseModel";
 import { TMSTileLayer } from "../tmsTileLayer";
+import { TMSBaseMapTileLayer } from "../tmsMapTileLayer";
 
 var TileModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(TileModel, _BaseModel);
@@ -27,13 +28,28 @@ var TileModel = /*#__PURE__*/function (_BaseModel) {
     value: function getUninforms() {
       return {};
     }
+  }, {
+    key: "getTileLayer",
+    value: function getTileLayer(usage) {
+      switch (usage) {
+        case 'basemap':
+          return TMSBaseMapTileLayer;
+
+        default:
+          return TMSTileLayer;
+      }
+    }
   }, {
     key: "initModels",
     value: function initModels() {
       var source = this.layer.getSource();
 
-      if (source !== null && source !== void 0 && source.data.isTile) {
-        this.layer.tileLayer = new TMSTileLayer({
+      var _this$layer$getLayerC = this.layer.getLayerConfig(),
+          usage = _this$layer$getLayerC.usage;
+
+      if (source !== null && source !== void 0 && source.data.isTile && !this.layer.tileLayer) {
+        var tileLayer = this.getTileLayer(usage);
+        this.layer.tileLayer = new tileLayer({
           parent: this.layer,
           rendererService: this.rendererService,
           mapService: this.mapService,

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

@@ -30,7 +30,7 @@ export default class TileFactory implements ITileFactory {
     };
     createLayer(tileLayerOption: ILayerTileConfig): any;
     updateStyle(styles: ITileStyles): string;
-    getDefautStyleAttributeField(layer: ILayer, type: string): string | string[] | 2;
+    getDefautStyleAttributeField(layer: ILayer, type: string): string | string[] | 1;
     setStyleAttributeField(layer: ILayer, type: ScaleAttributeType, value: IScaleValue | undefined | string | string[]): ILayer | undefined;
     protected parseScaleValue(value: IScaleValue | string, type: string): (string | number | unknown[])[] | (import("@antv/l7-core").StyleAttributeField | ((...args: any[]) => [] | undefined))[];
     protected getTile(lng: number, lat: number): Tile;