@antv/l7-layers 2.21.1 → 2.21.2

package/lib/image/models/image.js

@@ -5,175 +5,113 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
-var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _triangulation = require("../../core/triangulation");
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
 /* babel-plugin-inline-import '../shaders/image_frag.glsl' */
-var ImageFrag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n    float u_opacity:1.0;\n    float u_brightness:1.0;\n    float u_contrast:1.0;\n    float u_saturation:1.0;\n    float u_gamma:1.0;\n};\n\nin vec2 v_texCoord;\nout vec4 outputColor;\nvec3 setContrast(vec3 rgb, float contrast) {\n  vec3 color = mix(vec3(0.5), rgb, contrast);\n  color = clamp(color, 0.0, 1.0);\n  return color;\n}\nvec3 setSaturation(vec3 rgb, float adjustment) {\n  const vec3 grayVector = vec3(0.2125, 0.7154, 0.0721);\n  vec3 intensity = vec3(dot(rgb, grayVector));\n  vec3 color = mix(intensity, rgb, adjustment);\n  color = clamp(color, 0.0, 1.0);\n  return color;\n}\nvoid main() {\n  vec4 color = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y));\n  //brightness\n  color.rgb = mix(vec3(0.0, 0.0, 0.0), color.rgb, u_brightness);\n  //contrast\n  color.rgb = setContrast(color.rgb, u_contrast);\n  // saturation\n  color.rgb = setSaturation(color.rgb, u_saturation);\n  // gamma\n  color.rgb = pow(color.rgb, vec3(u_gamma));\n  outputColor = color;\n  outputColor.a *= u_opacity;\n  if(outputColor.a < 0.01)\n    discard;\n}\n";
+const ImageFrag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n    float u_opacity:1.0;\n    float u_brightness:1.0;\n    float u_contrast:1.0;\n    float u_saturation:1.0;\n    float u_gamma:1.0;\n};\n\nin vec2 v_texCoord;\nout vec4 outputColor;\nvec3 setContrast(vec3 rgb, float contrast) {\n  vec3 color = mix(vec3(0.5), rgb, contrast);\n  color = clamp(color, 0.0, 1.0);\n  return color;\n}\nvec3 setSaturation(vec3 rgb, float adjustment) {\n  const vec3 grayVector = vec3(0.2125, 0.7154, 0.0721);\n  vec3 intensity = vec3(dot(rgb, grayVector));\n  vec3 color = mix(intensity, rgb, adjustment);\n  color = clamp(color, 0.0, 1.0);\n  return color;\n}\nvoid main() {\n  vec4 color = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y));\n  //brightness\n  color.rgb = mix(vec3(0.0, 0.0, 0.0), color.rgb, u_brightness);\n  //contrast\n  color.rgb = setContrast(color.rgb, u_contrast);\n  // saturation\n  color.rgb = setSaturation(color.rgb, u_saturation);\n  // gamma\n  color.rgb = pow(color.rgb, vec3(u_gamma));\n  outputColor = color;\n  outputColor.a *= u_opacity;\n  if(outputColor.a < 0.01)\n    discard;\n}\n";
 /* babel-plugin-inline-import '../shaders/image_vert.glsl' */
-var ImageVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n    float u_opacity:1.0;\n    float u_brightness:1.0;\n    float u_contrast:1.0;\n    float u_saturation:1.0;\n    float u_gamma:1.0;\n};\n\nout 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   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n \n}\n";
-var ImageModel = exports.default = /*#__PURE__*/function (_BaseModel) {
-  (0, _inherits2.default)(ImageModel, _BaseModel);
-  var _super = _createSuper(ImageModel);
-  function ImageModel() {
-    (0, _classCallCheck2.default)(this, ImageModel);
-    return _super.apply(this, arguments);
+const ImageVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n    float u_opacity:1.0;\n    float u_brightness:1.0;\n    float u_contrast:1.0;\n    float u_saturation:1.0;\n    float u_gamma:1.0;\n};\n\nout 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   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n \n}\n";
+class ImageModel extends _BaseModel.default {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "texture", void 0);
   }
-  (0, _createClass2.default)(ImageModel, [{
-    key: "getCommonUniformsInfo",
-    value: function getCommonUniformsInfo() {
-      var _ref = this.layer.getLayerConfig(),
-        opacity = _ref.opacity,
-        brightness = _ref.brightness,
-        contrast = _ref.contrast,
-        saturation = _ref.saturation,
-        gamma = _ref.gamma;
-      var commonOptions = {
-        u_opacity: (0, _l7Utils.defaultValue)(opacity, 1.0),
-        u_brightness: (0, _l7Utils.defaultValue)(brightness, 1.0),
-        u_contrast: (0, _l7Utils.defaultValue)(contrast, 1.0),
-        u_saturation: (0, _l7Utils.defaultValue)(saturation, 1.0),
-        u_gamma: (0, _l7Utils.defaultValue)(gamma, 1.0)
-      };
-      this.textures = [this.texture];
-      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-      return commonBufferInfo;
-    }
-  }, {
-    key: "initModels",
-    value: function () {
-      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return this.loadTexture();
-            case 2:
-              return _context.abrupt("return", this.buildModels());
-            case 3:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-      return initModels;
-    }()
-  }, {
-    key: "clearModels",
-    value: function clearModels() {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
-    }
-  }, {
-    key: "loadTexture",
-    value: function () {
-      var _loadTexture = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var createTexture2D, source, imageData;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              createTexture2D = this.rendererService.createTexture2D;
-              this.texture = createTexture2D({
-                height: 1,
-                width: 1
-              });
-              source = this.layer.getSource();
-              _context2.next = 5;
-              return source.data.images;
-            case 5:
-              imageData = _context2.sent;
-              this.texture = createTexture2D({
-                data: imageData[0],
-                width: imageData[0].width,
-                height: imageData[0].height,
-                mag: _l7Core.gl.LINEAR,
-                min: _l7Core.gl.LINEAR
-              });
-            case 7:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function loadTexture() {
-        return _loadTexture.apply(this, arguments);
-      }
-      return loadTexture;
-    }()
-  }, {
-    key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var model;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              this.initUniformsBuffer();
-              _context3.next = 3;
-              return this.layer.buildLayerModel({
-                moduleName: 'rasterImage',
-                vertexShader: ImageVert,
-                fragmentShader: ImageFrag,
-                triangulation: _triangulation.RasterImageTriangulation,
-                primitive: _l7Core.gl.TRIANGLES,
-                blend: {
-                  // Tip: 优化显示效果
-                  enable: true
-                },
-                depth: {
-                  enable: false
-                },
-                pickingEnabled: false
-              });
-            case 3:
-              model = _context3.sent;
-              return _context3.abrupt("return", [model]);
-            case 5:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-      return buildModels;
-    }()
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'uv',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Uv',
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
-          buffer: {
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 2,
-          update: function update(feature, featureIdx, vertex) {
-            return [vertex[3], vertex[4]];
-          }
-        }
+  getCommonUniformsInfo() {
+    const {
+      opacity,
+      brightness,
+      contrast,
+      saturation,
+      gamma
+    } = this.layer.getLayerConfig();
+    const commonOptions = {
+      u_opacity: (0, _l7Utils.defaultValue)(opacity, 1.0),
+      u_brightness: (0, _l7Utils.defaultValue)(brightness, 1.0),
+      u_contrast: (0, _l7Utils.defaultValue)(contrast, 1.0),
+      u_saturation: (0, _l7Utils.defaultValue)(saturation, 1.0),
+      u_gamma: (0, _l7Utils.defaultValue)(gamma, 1.0)
+    };
+    this.textures = [this.texture];
+    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+    return commonBufferInfo;
+  }
+  initModels() {
+    var _this = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      yield _this.loadTexture();
+      return _this.buildModels();
+    })();
+  }
+  clearModels() {
+    var _this$texture;
+    (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+  }
+  loadTexture() {
+    var _this2 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      const {
+        createTexture2D
+      } = _this2.rendererService;
+      _this2.texture = createTexture2D({
+        height: 1,
+        width: 1
       });
-    }
-  }]);
-  return ImageModel;
-}(_BaseModel2.default);
+      const source = _this2.layer.getSource();
+      const imageData = yield source.data.images;
+      _this2.texture = createTexture2D({
+        data: imageData[0],
+        width: imageData[0].width,
+        height: imageData[0].height,
+        mag: _l7Core.gl.LINEAR,
+        min: _l7Core.gl.LINEAR
+      });
+    })();
+  }
+  buildModels() {
+    var _this3 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      _this3.initUniformsBuffer();
+      const model = yield _this3.layer.buildLayerModel({
+        moduleName: 'rasterImage',
+        vertexShader: ImageVert,
+        fragmentShader: ImageFrag,
+        triangulation: _triangulation.RasterImageTriangulation,
+        primitive: _l7Core.gl.TRIANGLES,
+        blend: {
+          // Tip: 优化显示效果
+          enable: true
+        },
+        depth: {
+          enable: false
+        },
+        pickingEnabled: false
+      });
+      return [model];
+    })();
+  }
+  registerBuiltinAttributes() {
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'uv',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Uv',
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
+        buffer: {
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 2,
+        update: (feature, featureIdx, vertex) => {
+          return [vertex[3], vertex[4]];
+        }
+      }
+    });
+  }
+}
+exports.default = ImageModel;

package/lib/image/models/index.d.ts

@@ -0,0 +1,5 @@
+export type ImageModelType = 'image';
+declare const ImageModels: {
+    [key in ImageModelType]: any;
+};
+export default ImageModels;

package/lib/image/models/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _image = _interopRequireDefault(require("./image"));
-var ImageModels = {
+const ImageModels = {
   image: _image.default
 };
 var _default = exports.default = ImageModels;

package/lib/index.d.ts

@@ -0,0 +1,18 @@
+import CanvasLayer from './canvas';
+import CityBuildingLayer from './citybuliding/building';
+import BaseLayer from './core/BaseLayer';
+import BaseModel from './core/BaseModel';
+import GeometryLayer from './geometry';
+import HeatmapLayer from './heatmap';
+import ImageLayer from './image';
+import LineLayer from './line/index';
+import PointLayer from './point';
+import PolygonLayer from './polygon';
+import RasterLayer from './raster';
+import TileLayer from './tile/core/BaseLayer';
+import TileDebugLayer from './tile/core/TileDebugLayer';
+import EarthLayer from './earth';
+import MaskLayer from './mask';
+import WindLayer from './wind';
+export * from './core/interface';
+export { BaseLayer, BaseModel, CanvasLayer, CityBuildingLayer, EarthLayer, GeometryLayer, HeatmapLayer, ImageLayer, LineLayer, MaskLayer, PointLayer, PolygonLayer, RasterLayer, TileDebugLayer, TileLayer, WindLayer, };

package/lib/index.js

@@ -24,97 +24,97 @@ var _exportNames = {
 };
 Object.defineProperty(exports, "BaseLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _BaseLayer.default;
   }
 });
 Object.defineProperty(exports, "BaseModel", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _BaseModel.default;
   }
 });
 Object.defineProperty(exports, "CanvasLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _canvas.default;
   }
 });
 Object.defineProperty(exports, "CityBuildingLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _building.default;
   }
 });
 Object.defineProperty(exports, "EarthLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _earth.default;
   }
 });
 Object.defineProperty(exports, "GeometryLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _geometry.default;
   }
 });
 Object.defineProperty(exports, "HeatmapLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _heatmap.default;
   }
 });
 Object.defineProperty(exports, "ImageLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _image.default;
   }
 });
 Object.defineProperty(exports, "LineLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _index.default;
   }
 });
 Object.defineProperty(exports, "MaskLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mask.default;
   }
 });
 Object.defineProperty(exports, "PointLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _point.default;
   }
 });
 Object.defineProperty(exports, "PolygonLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _polygon.default;
   }
 });
 Object.defineProperty(exports, "RasterLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _raster.default;
   }
 });
 Object.defineProperty(exports, "TileDebugLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _TileDebugLayer.default;
   }
 });
 Object.defineProperty(exports, "TileLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _BaseLayer2.default;
   }
 });
 Object.defineProperty(exports, "WindLayer", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _wind.default;
   }
 });
@@ -141,7 +141,7 @@ Object.keys(_interface).forEach(function (key) {
   if (key in exports && exports[key] === _interface[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _interface[key];
     }
   });

package/lib/line/index.d.ts

@@ -0,0 +1,36 @@
+import type { IParseDataItem } from '@antv/l7-core';
+import BaseLayer from '../core/BaseLayer';
+import type { ILineLayerStyleOptions } from '../core/interface';
+import type { LineModelType } from './models';
+export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
+    type: string;
+    enableShaderEncodeStyles: string[];
+    arrowInsertCount: number;
+    defaultSourceConfig: {
+        data: {
+            lng1: number;
+            lat1: number;
+            lng2: number;
+            lat2: number;
+        }[];
+        options: {
+            parser: {
+                type: string;
+                x: string;
+                y: string;
+                x1: string;
+                y1: string;
+            };
+        };
+    };
+    buildModels(): Promise<void>;
+    protected getDefaultConfig(): {} | {} | {} | {
+        blend: string;
+    } | {
+        blend: string;
+    } | {
+        blend: string;
+    } | {} | {};
+    getModelType(): LineModelType;
+    processData(filterData: IParseDataItem[]): IParseDataItem[];
+}