@antv/l7-layers 2.10.6 → 2.10.9

package/es/raster/models/rasterTile.js

@@ -1,8 +1,10 @@
+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 _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); }; }
 
@@ -14,7 +16,7 @@ import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/raster_2d_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\n\n\n\n// float getBlurIndusty() {\n//   vec2 u_ViewportSize = vec2(1024);\n\n//     float vW = 2.0/u_ViewportSize.x;\n//     float vH = 2.0/u_ViewportSize.y;\n//     vec2 vUv = v_texCoord;\n//     float i11 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y + 1.0 * vH) ).r;\n//     float i12 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y + 1.0 * vH) ).r;\n//     float i13 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y + 1.0 * vH) ).r;\n\n//     float i21 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y) ).r;\n//     float i22 = texture2D( u_texture, vec2( vUv.x , vUv.y) ).r;\n//     float i23 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y) ).r;\n\n//     float i31 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y-1.0*vH) ).r;\n//     float i32 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y-1.0*vH) ).r;\n//     float i33 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y-1.0*vH) ).r;\n\n//     return(\n//         i11 + \n//         i12 + \n//         i13 + \n//         i21 + \n//         i21 + \n//         i22 + \n//         i23 + \n//         i31 + \n//         i32 + \n//         i33\n//         )/9.0;\n// }\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n\n  // float value = getBlurIndusty();\n\n\n  if (value == u_noDataValue)\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n    gl_FragColor = vec4(0, 0, 0, 0);\n  else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n  }\n}\n";
+var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n    gl_FragColor = vec4(0, 0, 0, 0);\n  else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n  }\n}\n";
 
 /* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
 var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
@@ -66,44 +68,83 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      var _ref2 = this.layer.getLayerConfig(),
-          _ref2$mask = _ref2.mask,
-          mask = _ref2$mask === void 0 ? false : _ref2$mask,
-          _ref2$maskInside = _ref2.maskInside,
-          maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
-
-      var source = this.layer.getSource();
-      var createTexture2D = this.rendererService.createTexture2D;
-      var parserDataItem = source.data.dataArray[0];
-      this.texture = createTexture2D({
-        data: parserDataItem.data,
-        width: parserDataItem.width,
-        height: parserDataItem.height,
-        format: gl.LUMINANCE,
-        type: gl.FLOAT
-      });
-      this.layer.buildLayerModel({
-        moduleName: 'rasterTileImageData',
-        vertexShader: rasterVert,
-        fragmentShader: rasterFrag,
-        triangulation: RasterImageTriangulation,
-        depth: {
-          enable: false
-        },
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, model;
+
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _ref2 = this.layer.getLayerConfig(), _ref2$mask = _ref2.mask, mask = _ref2$mask === void 0 ? false : _ref2$mask, _ref2$maskInside = _ref2.maskInside, maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
+                source = this.layer.getSource();
+                createTexture2D = this.rendererService.createTexture2D;
+                parserDataItem = source.data.dataArray[0];
+                this.texture = createTexture2D({
+                  data: parserDataItem.data,
+                  width: parserDataItem.width,
+                  height: parserDataItem.height,
+                  format: gl.LUMINANCE,
+                  type: gl.FLOAT
+                });
+                _context.next = 7;
+                return this.layer.buildLayerModel({
+                  moduleName: 'rasterTileImageData',
+                  vertexShader: rasterVert,
+                  fragmentShader: rasterFrag,
+                  triangulation: RasterImageTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  stencil: getMask(mask, maskInside)
+                });
+
+              case 7:
+                model = _context.sent;
+                return _context.abrupt("return", [model]);
+
+              case 9:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return this.initModels();
+
+              case 2:
+                return _context2.abrupt("return", _context2.sent);
+
+              case 3:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {

package/es/raster/shaders/raster_2d_frag.glsl

@@ -9,49 +9,13 @@ uniform float u_noDataValue;
 uniform bool u_clampLow: true;
 uniform bool u_clampHigh: true;
 varying vec2 v_texCoord;
+bool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }
 
 
-
-// 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)
+  if (value == u_noDataValue || isnan_emu(value))
     gl_FragColor = vec4(0.0, 0, 0, 0.0);
   else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))
     gl_FragColor = vec4(0, 0, 0, 0);

package/es/raster/shaders/raster_rgb_frag.glsl

@@ -1,12 +1,18 @@
 precision mediump float;
+uniform vec2 u_rminmax: vec2(0,255); 
+uniform vec2 u_gminmax: vec2(0,255);
+uniform vec2 u_bminmax: vec2(0,255);
 uniform float u_opacity: 1.0;
 uniform sampler2D u_texture;
-uniform float u_channelRMax: 256.;
-uniform float u_channelGMax: 256.;
-uniform float u_channelBMax: 256.;
+uniform float u_noDataValue : 0.0;
 varying vec2 v_texCoord;
 
 void main() {
   vec3 rgb = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).rgb;
-  gl_FragColor = vec4(rgb.r/u_channelRMax, rgb.g/u_channelGMax, rgb.b/u_channelBMax, u_opacity);
+  if(rgb == vec3(u_noDataValue)) {
+    gl_FragColor = vec4(0.0, 0, 0, 0.0);
+  } else {
+    gl_FragColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);
+  }
+ 
 }

package/es/raster/shaders/raster_terrain_rgb_frag.glsl

@@ -0,0 +1,31 @@
+precision mediump float;
+uniform float u_opacity: 1.0;
+
+uniform sampler2D u_texture;
+uniform sampler2D u_colorTexture;
+
+varying vec2 v_texCoord;
+
+uniform vec2 u_domain;
+uniform float u_noDataValue;
+uniform bool u_clampLow: true;
+uniform bool u_clampHigh: true;
+
+void main() {
+  vec4 baseColor = texture2D(u_texture, vec2(v_texCoord.x, v_texCoord.y)) * 256.0;
+  float r = baseColor.r * 256.0 * 256.0;
+  float g = baseColor.g * 256.0;
+  float b = baseColor.b;
+  float value =  (r + g + b) * 0.1 - 10000.0;
+  
+  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])) {
+     gl_FragColor = vec4(0.0, 0, 0, 0.0);
+  } else {
+    float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);
+    vec4 color = texture2D(u_colorTexture, vec2(normalisedValue, 0));
+    gl_FragColor = color;
+    gl_FragColor.a =  gl_FragColor.a * u_opacity ;
+  }
+}

package/es/raster/shaders/rater_terrain_rgb_vert.glsl

@@ -0,0 +1,17 @@
+precision highp float;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+attribute vec3 a_Position;
+attribute vec2 a_Uv;
+varying vec2 v_texCoord;
+#pragma include "projection"
+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));
+   } else {
+      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));
+   }
+}

package/es/tile/interaction/getRasterData.d.ts

@@ -1,4 +1,4 @@
 import { IMapService, IRendererService } from '@antv/l7-core';
-import { Tile } from '@antv/l7-utils';
-export declare function readRasterValue(tile: Tile, mapService: IMapService, x: number, y: number): any;
+import { SourceTile } from '@antv/l7-utils';
+export declare function readRasterValue(tile: SourceTile, mapService: IMapService, x: number, y: number): any;
 export declare function readPixel(x: number, y: number, rendererService: IRendererService): false | Uint8Array;

package/es/tile/interaction/utils.js

@@ -27,7 +27,7 @@ export function setSelect(layers, pickedColors, renderList) {
   }); // unselect normal layer
 
   renderList.filter(function (layer) {
-    return layer.inited && !layer.isVector && layer.isVisible() && layer.needPick('click');
+    return layer.inited && layer.isVisible() && layer.needPick('click');
   }).filter(function (layer) {
     return layer.getCurrentSelectedId() !== null;
   }).map(function (layer) {
@@ -39,9 +39,8 @@ export function setSelect(layers, pickedColors, renderList) {
 export function setHighlight(layers, pickedColors) {
   var pickId = decodePickingColor(pickedColors);
   layers.filter(function (layer) {
-    return layer.inited && layer.isVisible() && layer.isVector;
-  }) // Tip: 使用 vectorLayer 上的 pickID 优化高亮操作（过滤重复操作）
-  // @ts-ignore
+    return layer.inited && layer.isVisible();
+  }) // @ts-ignore
   .filter(function (layer) {
     return layer.getPickID() !== pickId;
   }).map(function (layer) {
@@ -53,13 +52,6 @@ export function setHighlight(layers, pickedColors) {
 export function setPickState(layers, pickColors) {
   if (pickColors.select) {
     layers.map(function (layer) {
-      // if(layer.modelLoaded) {
-      //   selectFeature(layer, this.pickColors.select);
-      // } else {
-      //   layer.once('modelLoaded', () => {
-      //     selectFeature(layer, this.pickColors.select);
-      //   })
-      // }
       selectFeature(layer, pickColors.select);
     });
   }

package/es/tile/interface.d.ts

@@ -1,7 +1,7 @@
 import { ILayer, IMapService, IRendererService, ISource, ISubLayerInitOptions } from '@antv/l7-core';
-import { Tile } from '@antv/l7-utils';
-export declare type Timeout = any;
-export declare type CacheEvent = 'click' | 'mousemove' | 'mouseup' | 'mousedown' | 'contextmenu';
+import { SourceTile } from '@antv/l7-utils';
+export type Timeout = any;
+export type CacheEvent = 'click' | 'mousemove' | 'mouseup' | 'mousedown' | 'contextmenu';
 export interface ITileFactoryOptions {
     parent: ILayer;
     mapService: IMapService;
@@ -12,16 +12,17 @@ export interface ITileStyles {
 }
 export interface ILayerTileConfig {
     L7Layer?: any;
-    tile: Tile;
+    tile: SourceTile;
     initOptions: ISubLayerInitOptions;
     vectorTileLayer?: any;
     source: ISource;
     needListen?: boolean;
 }
 export interface ITileFactory {
-    createTile(tile: Tile, initOptions: ISubLayerInitOptions): {
+    loaded: boolean;
+    layers: ILayer[];
+    createTile(tile: SourceTile, initOptions: ISubLayerInitOptions): {
         layers: ILayer[];
-        layerIDList: string[];
     };
     createLayer(option: ILayerTileConfig): ILayer;
     updateStyle(styles: ITileStyles): string;

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

@@ -1,30 +1,35 @@
-import { ILayer, IRendererService, IMapService, ISubLayerInitOptions } from '@antv/l7-core';
-import { Tile } from '@antv/l7-utils';
-import { ITileFactory } from '../tileFactory';
+import { ILayer, IRendererService, IMapService, ISubLayerInitOptions, ILayerService } from '@antv/l7-core';
+import { SourceTile } from '@antv/l7-utils';
 export declare class Base {
     sourceLayer: string;
     parent: ILayer;
     children: ILayer[];
     mapService: IMapService;
     rendererService: IRendererService;
-    protected tileFactory: ITileFactory;
+    protected tileFactory: any;
     protected initOptions: ISubLayerInitOptions;
     private tileCache;
-    hasTile(tile: Tile): boolean;
-    addTile(tile: Tile): {
-        layers: ILayer[];
-        layerIDList: string[];
-    };
-    removeTile(tile: Tile): void;
+    private tileLayerCache;
+    private initTileLayers;
+    render(): void;
+    hasTile(tile: SourceTile): boolean;
+    addTile(tile: SourceTile): Promise<any>;
+    removeTile(tile: SourceTile): void;
     addChild(layer: ILayer): void;
     addChildren(layers: ILayer[]): void;
-    removeChildren(layerIDList: string[], refresh?: boolean): void;
+    removeLayers(layers?: ILayer[], refresh?: boolean): void;
     removeChild(layer: ILayer): void;
-    getChildren(layerIDList: string[]): ILayer[];
+    getLayers(tile: SourceTile): ILayer[];
     getChild(layerID: string): ILayer;
     clearChild(): void;
     hasChild(layer: ILayer): boolean;
     initTileFactory(): void;
     getSourceLayer(parentParserType: string, sourceLayer: string | undefined): string | undefined;
+    updateTileVisible(tile: SourceTile, layerService: ILayerService): void;
+    listenLoad(tile: SourceTile, callback: () => void): void;
+    isTileLoaded(tile: SourceTile): boolean;
+    isTileChildLoaded(tile: SourceTile): boolean;
+    isTileParentLoaded(tile: SourceTile): boolean;
+    isTileAllLoad(tile: SourceTile): boolean;
     destroy(): void;
 }