@antv/l7-layers 2.10.6 → 2.10.9

package/es/image/shaders/dataImage_frag.glsl

@@ -11,28 +11,22 @@ uniform float u_noDataValue;
 uniform bool u_clampLow: true;
 uniform bool u_clampHigh: true;
 
-uniform float u_pixelConstant;
-uniform float u_pixelConstantR;
-uniform float u_pixelConstantG;
-uniform float u_pixelConstantB;
-uniform float u_pixelConstantRGB;
-
 void main() {
   vec4 baseColor = texture2D(u_texture, vec2(v_texCoord.x, v_texCoord.y));
 
   float r = baseColor.r;
   float g = baseColor.g;
   float b = baseColor.b;
-
-  float value = u_pixelConstant + ((r * u_pixelConstantR + g * u_pixelConstantG + b * u_pixelConstantB) * u_pixelConstantRGB);
-  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);
-  } else {
+  float value = -10000.0 + ((r * 256.0 * 256.0 + g * 256.0 + b) * 0.1);
+  // 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);
+  // } 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 ;
-  }
+    gl_FragColor = vec4(r,g,b, 1.0);
+    // gl_FragColor = color;
+    // gl_FragColor.a =  gl_FragColor.a * u_opacity ;
+  // }
 }

package/es/index.d.ts

@@ -9,9 +9,9 @@ import LineLayer from './line/index';
 import PointLayer from './point';
 import PolygonLayer from './polygon';
 import RasterLayer from './raster';
+import TileDebugLayer from './tile/tileFactory/layers/TileDebugLayer';
 import EarthLayer from './earth';
 import MaskLayer from './mask';
 import WindLayer from './wind';
-import TileDebugLayer from './tile/tileFactory/layers/tileTest';
-export { BaseLayer, BaseModel, PointLayer, PolygonLayer, LineLayer, CityBuildingLayer, GeometryLayer, CanvasLayer, ImageLayer, RasterLayer, HeatmapLayer, EarthLayer, WindLayer, MaskLayer, TileDebugLayer };
+export { BaseLayer, BaseModel, PointLayer, PolygonLayer, LineLayer, CityBuildingLayer, GeometryLayer, CanvasLayer, ImageLayer, RasterLayer, HeatmapLayer, EarthLayer, WindLayer, MaskLayer, TileDebugLayer, };
 export * from './core/interface';

package/es/index.js

@@ -11,10 +11,10 @@ import LineLayer from "./line/index";
 import PointLayer from "./point";
 import PolygonLayer from "./polygon";
 import RasterLayer from "./raster";
+import TileDebugLayer from "./tile/tileFactory/layers/TileDebugLayer";
 import EarthLayer from "./earth";
 import MaskLayer from "./mask";
-import WindLayer from "./wind";
-import TileDebugLayer from "./tile/tileFactory/layers/tileTest"; // import ConfigSchemaValidationPlugin from './plugins/ConfigSchemaValidationPlugin';
+import WindLayer from "./wind"; // import ConfigSchemaValidationPlugin from './plugins/ConfigSchemaValidationPlugin';
 
 import DataMappingPlugin from "./plugins/DataMappingPlugin";
 import DataSourcePlugin from "./plugins/DataSourcePlugin";

package/es/line/index.d.ts

@@ -1,3 +1,4 @@
+import { IParseDataItem } from '@antv/l7-core';
 import BaseLayer from '../core/BaseLayer';
 import { ILineLayerStyleOptions } from '../core/interface';
 import { LineModelType } from './models';
@@ -21,14 +22,14 @@ export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
             };
         };
     };
-    buildModels(): void;
-    rebuildModels(): void;
+    buildModels(): Promise<void>;
     protected getDefaultConfig(): {} | {} | {} | {} | {
         blend: string;
     } | {
         blend: string;
     } | {
         blend: string;
-    } | {} | {} | {} | {};
-    protected getModelType(): LineModelType;
+    } | {} | {} | {};
+    getModelType(): LineModelType;
+    processData(filterData: IParseDataItem[]): IParseDataItem[];
 }

package/es/line/index.js

@@ -1,3 +1,5 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+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 _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -5,13 +7,13 @@ 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 _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+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); }; }
 
 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 BaseLayer from "../core/BaseLayer";
-import { isVectorTile } from "../tile/utils";
 import LineModels from "./models";
 
 var LineLayer = /*#__PURE__*/function (_BaseLayer) {
@@ -57,24 +59,31 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(LineLayer, [{
     key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var shape = this.getModelType();
-      this.layerModel = new LineModels[shape](this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var shape;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                shape = this.getModelType();
+                this.layerModel = new LineModels[shape](this);
+                this.initLayerModels();
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
 
-      this.layerModel.buildModels(function (models) {
-        _this3.dispatchModelLoad(models);
-      });
-    }
+      return buildModels;
+    }()
   }, {
     key: "getDefaultConfig",
     value: function getDefaultConfig() {
@@ -93,7 +102,6 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
         greatcircle: {
           blend: 'additive'
         },
-        vectorline: {},
         tileLine: {},
         halfLine: {},
         earthArc3d: {}
@@ -109,16 +117,34 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
         return this.layerType;
       }
 
-      var parserType = this.layerSource.getParserType();
-
-      if (isVectorTile(parserType)) {
-        return 'vectorline';
-      }
-
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
       var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
       return shape || 'line';
     }
+  }, {
+    key: "processData",
+    value: function processData(filterData) {
+      // simple line 在接受 multiPolygon 的数据进行绘制的时候需要对数据进行拆解
+      if (this.getModelType() !== 'simple') {
+        return filterData;
+      }
+
+      var dataArray = [];
+      filterData.map(function (data) {
+        if (Array.isArray(data.coordinates) && Array.isArray(data.coordinates[0]) && Array.isArray(data.coordinates[0][0])) {
+          var object = _objectSpread({}, data);
+
+          data.coordinates.map(function (d) {
+            dataArray.push(_objectSpread(_objectSpread({}, object), {}, {
+              coordinates: d
+            }));
+          });
+        } else {
+          dataArray.push(data);
+        }
+      });
+      return dataArray;
+    }
   }]);
 
   return LineLayer;

package/es/line/models/arc.d.ts

@@ -4,14 +4,14 @@ export default class ArcModel extends BaseModel {
     protected texture: ITexture2D;
     getUninforms(): IModelUniform;
     getAnimateUniforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     clearModels(): void;
     getShaders(): {
         frag: string;
         vert: string;
         type: string;
     };
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
     private updateTexture;
 }

package/es/line/models/arc.js

@@ -1,3 +1,4 @@
+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 _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -5,6 +6,7 @@ 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 _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+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); }; }
 
@@ -198,11 +200,34 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.updateTexture();
-      this.iconService.on('imageUpdate', this.updateTexture);
-      this.buildModels(callbackModel);
-    }
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                this.updateTexture();
+                this.iconService.on('imageUpdate', this.updateTexture);
+                _context.next = 4;
+                return this.buildModels();
+
+              case 4:
+                return _context.abrupt("return", _context.sent);
+
+              case 5:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -245,39 +270,49 @@ var ArcModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      var _ref4 = this.layer.getLayerConfig(),
-          _ref4$segmentNumber = _ref4.segmentNumber,
-          segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber,
-          _ref4$mask = _ref4.mask,
-          mask = _ref4$mask === void 0 ? false : _ref4$mask,
-          _ref4$maskInside = _ref4.maskInside,
-          maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
-
-      var _this$getShaders = this.getShaders(),
-          frag = _this$getShaders.frag,
-          vert = _this$getShaders.vert,
-          type = _this$getShaders.type; //
-
-
-      this.layer.buildLayerModel({
-        moduleName: 'lineArc2d' + type,
-        vertexShader: vert,
-        fragmentShader: frag,
-        triangulation: LineArcTriangulation,
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend(),
-        segmentNumber: segmentNumber,
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref4, _ref4$segmentNumber, segmentNumber, _ref4$mask, mask, _ref4$maskInside, maskInside, _this$getShaders, frag, vert, type, model;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _ref4 = this.layer.getLayerConfig(), _ref4$segmentNumber = _ref4.segmentNumber, segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber, _ref4$mask = _ref4.mask, mask = _ref4$mask === void 0 ? false : _ref4$mask, _ref4$maskInside = _ref4.maskInside, maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
+                _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type; //
+
+                _context2.next = 4;
+                return this.layer.buildLayerModel({
+                  moduleName: 'lineArc2d' + type,
+                  vertexShader: vert,
+                  fragmentShader: frag,
+                  triangulation: LineArcTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend(),
+                  segmentNumber: segmentNumber,
+                  stencil: getMask(mask, maskInside)
+                });
+
+              case 4:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 6:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/line/models/arc_3d.d.ts

@@ -4,14 +4,14 @@ export default class Arc3DModel extends BaseModel {
     protected texture: ITexture2D;
     getUninforms(): IModelUniform;
     getAnimateUniforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     clearModels(): void;
     getShaders(): {
         frag: string;
         vert: string;
         type: string;
     };
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
     private updateTexture;
 }

package/es/line/models/arc_3d.js

@@ -1,3 +1,4 @@
+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 _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -5,6 +6,7 @@ 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 _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+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); }; }
 
@@ -189,11 +191,34 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.updateTexture();
-      this.iconService.on('imageUpdate', this.updateTexture);
-      this.buildModels(callbackModel);
-    }
+    value: function () {
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                this.updateTexture();
+                this.iconService.on('imageUpdate', this.updateTexture);
+                _context.next = 4;
+                return this.buildModels();
+
+              case 4:
+                return _context.abrupt("return", _context.sent);
+
+              case 5:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -227,35 +252,45 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      var _ref4 = this.layer.getLayerConfig(),
-          _ref4$segmentNumber = _ref4.segmentNumber,
-          segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber,
-          _ref4$mask = _ref4.mask,
-          mask = _ref4$mask === void 0 ? false : _ref4$mask,
-          _ref4$maskInside = _ref4.maskInside,
-          maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
-
-      var _this$getShaders = this.getShaders(),
-          frag = _this$getShaders.frag,
-          vert = _this$getShaders.vert,
-          type = _this$getShaders.type;
-
-      this.layer.buildLayerModel({
-        moduleName: 'lineArc3d' + type,
-        vertexShader: vert,
-        fragmentShader: frag,
-        triangulation: LineArcTriangulation,
-        blend: this.getBlend(),
-        segmentNumber: segmentNumber,
-        stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref4, _ref4$segmentNumber, segmentNumber, _ref4$mask, mask, _ref4$maskInside, maskInside, _this$getShaders, frag, vert, type, model;
+
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _ref4 = this.layer.getLayerConfig(), _ref4$segmentNumber = _ref4.segmentNumber, segmentNumber = _ref4$segmentNumber === void 0 ? 30 : _ref4$segmentNumber, _ref4$mask = _ref4.mask, mask = _ref4$mask === void 0 ? false : _ref4$mask, _ref4$maskInside = _ref4.maskInside, maskInside = _ref4$maskInside === void 0 ? true : _ref4$maskInside;
+                _this$getShaders = this.getShaders(), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
+                _context2.next = 4;
+                return this.layer.buildLayerModel({
+                  moduleName: 'lineArc3d' + type,
+                  vertexShader: vert,
+                  fragmentShader: frag,
+                  triangulation: LineArcTriangulation,
+                  blend: this.getBlend(),
+                  segmentNumber: segmentNumber,
+                  stencil: getMask(mask, maskInside)
+                });
+
+              case 4:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 6:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/line/models/earthArc_3d.d.ts

@@ -4,14 +4,14 @@ export default class Arc3DModel extends BaseModel {
     protected texture: ITexture2D;
     getUninforms(): IModelUniform;
     getAnimateUniforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     clearModels(): void;
     getShaders(): {
         frag: string;
         vert: string;
         type: string;
     };
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
     private updateTexture;
 }