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

package/es/raster/shaders/raster_2d_frag.glsl

@@ -10,9 +10,47 @@ uniform bool u_clampLow: true;
 uniform bool u_clampHigh: true;
 varying vec2 v_texCoord;
 
+
+
+// float getBlurIndusty() {
+//   vec2 u_ViewportSize = vec2(1024);
+
+//     float vW = 2.0/u_ViewportSize.x;
+//     float vH = 2.0/u_ViewportSize.y;
+//     vec2 vUv = v_texCoord;
+//     float i11 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y + 1.0 * vH) ).r;
+//     float i12 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y + 1.0 * vH) ).r;
+//     float i13 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y + 1.0 * vH) ).r;
+
+//     float i21 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y) ).r;
+//     float i22 = texture2D( u_texture, vec2( vUv.x , vUv.y) ).r;
+//     float i23 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y) ).r;
+
+//     float i31 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y-1.0*vH) ).r;
+//     float i32 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y-1.0*vH) ).r;
+//     float i33 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y-1.0*vH) ).r;
+
+//     return(
+//         i11 + 
+//         i12 + 
+//         i13 + 
+//         i21 + 
+//         i21 + 
+//         i22 + 
+//         i23 + 
+//         i31 + 
+//         i32 + 
+//         i33
+//         )/9.0;
+// }
+
 void main() {
 
   float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;
+
+  // float value = getBlurIndusty();
+
+
   if (value == u_noDataValue)
     gl_FragColor = vec4(0.0, 0, 0, 0.0);
   else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))
@@ -23,6 +61,4 @@ void main() {
     gl_FragColor = color;
     gl_FragColor.a =  gl_FragColor.a * u_opacity ;
   }
-
-
 }

package/es/raster/shaders/raster_2d_vert.glsl

@@ -8,7 +8,6 @@ varying vec2 v_texCoord;
 void main() {
    v_texCoord = a_Uv;
    vec4 project_pos = project_position(vec4(a_Position, 1.0));
-   gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));
 
    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
       gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));

package/es/tile/interface.d.ts

@@ -16,6 +16,7 @@ export interface ILayerTileConfig {
     initOptions: ISubLayerInitOptions;
     vectorTileLayer?: any;
     source: ISource;
+    needListen?: boolean;
 }
 export interface ITileFactory {
     createTile(tile: Tile, initOptions: ISubLayerInitOptions): {

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

@@ -1,29 +1,7 @@
 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;
+import { TileManager } from './baseTileManager';
+export declare class BaseMapTileLayerManager extends TileManager implements IBaseTileLayerManager {
     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;
+    private setSubLayerInitOption;
 }

package/es/tile/manager/baseMapTileLayerManager.js

@@ -1,109 +1,43 @@
-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 _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+
+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 { TileManager } from "./baseTileManager";
 import { getLayerShape, getMaskValue } from "../utils";
-export var BaseMapTileLayerManager = /*#__PURE__*/function () {
+export var BaseMapTileLayerManager = /*#__PURE__*/function (_TileManager) {
+  _inherits(BaseMapTileLayerManager, _TileManager);
+
+  var _super = _createSuper(BaseMapTileLayerManager);
+
   // only support vector layer
   function BaseMapTileLayerManager(parent, mapService, rendererService) {
+    var _this;
+
     _classCallCheck(this, BaseMapTileLayerManager);
 
-    this.parent = parent;
-    this.children = parent.layerChildren;
-    this.mapService = mapService;
-    this.rendererService = rendererService;
-    this.setSubLayerInitOptipn();
-    this.initTileFactory();
-  }
+    _this = _super.call(this);
+    _this.parent = parent;
+    _this.children = parent.layerChildren;
+    _this.mapService = mapService;
+    _this.rendererService = rendererService;
 
-  _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.setSubLayerInitOption();
 
-      (_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);
+    _this.initTileFactory();
 
-      if (layerIndex > -1) {
-        this.children.splice(layerIndex, 1);
-      }
+    return _this;
+  }
 
-      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);
-    }
-  }, {
+  _createClass(BaseMapTileLayerManager, [{
     key: "render",
     value: function render() {
-      var _this = this;
+      var _this2 = this;
 
       this.children.filter(function (layer) {
         return layer.inited;
@@ -115,7 +49,7 @@ export var BaseMapTileLayerManager = /*#__PURE__*/function () {
 
         if (layer.masks.length > 0) {
           // 清除上一次的模版缓存
-          _this.rendererService.clear({
+          _this2.rendererService.clear({
             stencil: 0,
             depth: 1,
             framebuffer: null
@@ -134,8 +68,8 @@ export var BaseMapTileLayerManager = /*#__PURE__*/function () {
       });
     }
   }, {
-    key: "setSubLayerInitOptipn",
-    value: function setSubLayerInitOptipn() {
+    key: "setSubLayerInitOption",
+    value: function setSubLayerInitOption() {
       var _colorAttribute$scale, _sizeAttribute$scale;
 
       var _ref = this.parent.getLayerConfig(),
@@ -179,29 +113,7 @@ export var BaseMapTileLayerManager = /*#__PURE__*/function () {
         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;
-}();
+}(TileManager);

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

@@ -0,0 +1,27 @@
+import { ILayer, IRendererService, IMapService, ISubLayerInitOptions } from '@antv/l7-core';
+import { Tile } from '@antv/l7-utils';
+import { ITileFactory } from '../tileFactory';
+export declare class TileManager {
+    sourceLayer: string;
+    parent: ILayer;
+    children: ILayer[];
+    mapService: IMapService;
+    rendererService: IRendererService;
+    protected tileFactory: ITileFactory;
+    protected initOptions: ISubLayerInitOptions;
+    createTile(tile: Tile): {
+        layers: ILayer[];
+        layerIDList: string[];
+    };
+    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;
+    initTileFactory(): void;
+    getSourceLayer(parentParserType: string, sourceLayer: string | undefined): string | undefined;
+    destroy(): void;
+}

package/es/tile/manager/baseTileManager.js

@@ -0,0 +1,107 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import { getTileFactory } from "../tileFactory";
+export var TileManager = /*#__PURE__*/function () {
+  function TileManager() {
+    _classCallCheck(this, TileManager);
+  }
+
+  _createClass(TileManager, [{
+    key: "createTile",
+    value: function createTile(tile) {
+      return this.tileFactory.createTile(tile, this.initOptions);
+    }
+  }, {
+    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: "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
+      });
+    }
+  }, {
+    key: "getSourceLayer",
+    value: function getSourceLayer(parentParserType, sourceLayer) {
+      if (parentParserType === 'geojsonvt') {
+        return 'geojsonvt';
+      } else if (parentParserType === 'testTile') {
+        return 'testTile';
+      } else {
+        return sourceLayer;
+      }
+    }
+  }, {
+    key: "destroy",
+    value: function destroy() {}
+  }]);
+
+  return TileManager;
+}();

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

@@ -1,37 +1,15 @@
 import { IInteractionTarget, ILayer, IMapService, IPickingService, IRendererService, ITileLayerManager, ITilePickManager, ITransform } from '@antv/l7-core';
-import { Tile } from '@antv/l7-utils';
+import { TileManager } from './baseTileManager';
 import { ITileConfigManager } from './tileConfigManager';
-export declare class TileLayerManager implements ITileLayerManager {
-    sourceLayer: string;
-    parent: ILayer;
-    children: ILayer[];
-    mapService: IMapService;
-    rendererService: IRendererService;
+export declare class TileLayerManager extends TileManager implements ITileLayerManager {
     tilePickManager: ITilePickManager;
     tileConfigManager: ITileConfigManager;
-    private tileFactory;
-    private initOptions;
-    private rampColorsData;
     private transforms;
     constructor(parent: ILayer, mapService: IMapService, rendererService: IRendererService, pickingService: IPickingService, transforms: ITransform[]);
-    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;
     pickLayers(target: IInteractionTarget): boolean;
-    private setSubLayerInitOptipn;
-    private getSourceLayer;
+    private setSubLayerInitOption;
     private setConfigListener;
     private updateStyle;
-    private initTileFactory;
+    destroy(): void;
 }