@antv/l7-layers 2.10.6 → 2.10.9

package/lib/heatmap/models/hexagon.js

@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 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"));
@@ -62,36 +66,75 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
+    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.buildModels();
+
+              case 2:
+                return _context.abrupt("return", _context.sent);
+
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "buildModels",
-    value: function buildModels(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;
-
-      this.layer.buildLayerModel({
-        moduleName: 'heatmapHexagon',
-        vertexShader: heatmapGridVert,
-        fragmentShader: heatmapGridFrag,
-        triangulation: _triangulation.HeatmapGridTriangulation,
-        depth: {
-          enable: false
-        },
-        primitive: _l7Core.gl.TRIANGLES,
-        blend: this.getBlend(),
-        stencil: (0, _l7Utils.getMask)(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, model;
+
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.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;
+                _context2.next = 3;
+                return this.layer.buildLayerModel({
+                  moduleName: 'heatmapHexagon',
+                  vertexShader: heatmapGridVert,
+                  fragmentShader: heatmapGridFrag,
+                  triangulation: _triangulation.HeatmapGridTriangulation,
+                  depth: {
+                    enable: false
+                  },
+                  primitive: _l7Core.gl.TRIANGLES,
+                  blend: this.getBlend(),
+                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                });
+
+              case 3:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/heatmap/shaders/hexagon_3d_vert.glsl

@@ -25,21 +25,10 @@ uniform vec2 u_SceneCenterMKT;
 void main() {
   mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));
   vec2 offset =(vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage));
-  // vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // 实际的经纬度
-  // vec2 lnglat = (a_Pos.xy + offset); 
-  // vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));
-  // gl_Position = project_common_position_to_clipspace(project_pos);
-  // float lightWeight = calc_lighting(project_pos);
-  // v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    // vec2 lnglat = (a_Pos.xy + offset); 
-    // vec4 project_pos = project_position(vec4(lnglat, a_Position.z * a_Size, 1.0));
 
-    // float lightWeight = calc_lighting(project_pos);
-    // v_color =vec4(a_Color.rgb*lightWeight, a_Color.w);
-  
-    // gl_Position = u_Mvp * vec4(lnglat , a_Position.z * a_Size, 1.0);
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+ 
     vec2 lnglat = unProjectFlat(a_Pos.xy + offset); // 经纬度
     vec2 customLnglat = customProject(lnglat) - u_SceneCenterMKT; // 将经纬度转换为高德2.0需要的平面坐标
     vec4 project_pos = project_position(vec4(customLnglat, a_Position.z * a_Size, 1.0));

package/lib/image/index.js

@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 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"));
@@ -50,52 +54,45 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
 
   (0, _createClass2.default)(ImageLayer, [{
     key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var modelType = this.getModelType();
-      this.layerModel = new _index.default[modelType](this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var modelType;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                modelType = this.getModelType();
+                this.layerModel = new _index.default[modelType](this);
+                _context.next = 4;
+                return this.initLayerModels();
+
+              case 4:
+              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() {
       var type = this.getModelType();
       var defaultConfig = {
-        image: {},
-        dataImage: {},
-        tileDataImage: {}
+        image: {}
       };
       return defaultConfig[type];
     }
   }, {
     key: "getModelType",
     value: function getModelType() {
-      var _shapeAttribute$scale;
-
-      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;
-
-      if (shape === 'dataImage') {
-        return 'dataImage';
-      } else if (shape === 'image') {
-        return 'image';
-      } else if (shape === 'tileDataImage') {
-        return 'tileDataImage';
-      } else {
-        return 'image';
-      }
+      return 'image';
     }
   }]);
   return ImageLayer;

package/lib/image/models/image.js

@@ -7,6 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 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"));
@@ -58,73 +62,98 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      var _this = this;
-
-      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;
-      this.texture = createTexture2D({
-        height: 0,
-        width: 0
-      });
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _this = this;
+
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, canvas, img, imageData, model;
+
+        return _regenerator.default.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;
+                this.texture = createTexture2D({
+                  height: 0,
+                  width: 0
+                });
+
+                if (!_l7Utils.isMini) {
+                  _context.next = 12;
+                  break;
+                }
+
+                // @ts-ignore
+                canvas = this.layerService.sceneService.getSceneConfig().canvas;
+                img = canvas.createImage();
+                img.crossOrigin = 'anonymous';
+                img.src = source.data.originData;
+
+                img.onload = function () {
+                  _this.texture = createTexture2D({
+                    data: img,
+                    width: img.width,
+                    height: img.height
+                  });
+
+                  _this.layerService.reRender();
+                };
+
+                _context.next = 16;
+                break;
+
+              case 12:
+                _context.next = 14;
+                return source.data.images;
+
+              case 14:
+                imageData = _context.sent;
+                this.texture = createTexture2D({
+                  data: imageData[0],
+                  width: imageData[0].width,
+                  height: imageData[0].height,
+                  mag: _l7Core.gl.LINEAR,
+                  min: _l7Core.gl.LINEAR
+                });
+
+              case 16:
+                _context.next = 18;
+                return this.layer.buildLayerModel({
+                  moduleName: 'rasterImage',
+                  vertexShader: ImageVert,
+                  fragmentShader: ImageFrag,
+                  triangulation: _triangulation.RasterImageTriangulation,
+                  primitive: _l7Core.gl.TRIANGLES,
+                  blend: {
+                    // Tip: 优化显示效果
+                    enable: true
+                  },
+                  depth: {
+                    enable: false
+                  },
+                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                });
+
+              case 18:
+                model = _context.sent;
+                return _context.abrupt("return", [model]);
+
+              case 20:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
 
-      if (_l7Utils.isMini) {
-        // @ts-ignore
-        var canvas = this.layerService.sceneService.getSceneConfig().canvas;
-        var img = canvas.createImage();
-        img.crossOrigin = 'anonymous';
-        img.src = source.data.originData;
-
-        img.onload = function () {
-          _this.texture = createTexture2D({
-            data: img,
-            width: img.width,
-            height: img.height
-          });
-
-          _this.layerService.reRender();
-        };
-      } else {
-        source.data.images.then(function (imageData) {
-          _this.texture = createTexture2D({
-            data: imageData[0],
-            width: imageData[0].width,
-            height: imageData[0].height,
-            mag: _l7Core.gl.LINEAR,
-            min: _l7Core.gl.LINEAR
-          });
-
-          _this.layerService.reRender();
-        });
+      function initModels() {
+        return _initModels.apply(this, arguments);
       }
 
-      this.layer.buildLayerModel({
-        moduleName: 'rasterImage',
-        vertexShader: ImageVert,
-        fragmentShader: ImageFrag,
-        triangulation: _triangulation.RasterImageTriangulation,
-        primitive: _l7Core.gl.TRIANGLES,
-        blend: {
-          // Tip: 优化显示效果
-          enable: true
-        },
-        depth: {
-          enable: false
-        },
-        stencil: (0, _l7Utils.getMask)(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+      return initModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -134,9 +163,32 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        return _regenerator.default.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: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/image/models/index.js

@@ -7,16 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _dataImage = _interopRequireDefault(require("./dataImage"));
-
 var _image = _interopRequireDefault(require("./image"));
 
-var _tileDataImage = _interopRequireDefault(require("./tileDataImage"));
-
 var ImageModels = {
-  image: _image.default,
-  dataImage: _dataImage.default,
-  tileDataImage: _tileDataImage.default
+  image: _image.default
 };
 var _default = ImageModels;
 exports.default = _default;

package/lib/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/lib/index.js

@@ -17,10 +17,10 @@ var _exportNames = {
   PointLayer: true,
   PolygonLayer: true,
   RasterLayer: true,
+  TileDebugLayer: true,
   EarthLayer: true,
   MaskLayer: true,
-  WindLayer: true,
-  TileDebugLayer: true
+  WindLayer: true
 };
 Object.defineProperty(exports, "BaseLayer", {
   enumerable: true,
@@ -103,7 +103,7 @@ Object.defineProperty(exports, "RasterLayer", {
 Object.defineProperty(exports, "TileDebugLayer", {
   enumerable: true,
   get: function get() {
-    return _tileTest.default;
+    return _TileDebugLayer.default;
   }
 });
 Object.defineProperty(exports, "WindLayer", {
@@ -137,14 +137,14 @@ var _polygon = _interopRequireDefault(require("./polygon"));
 
 var _raster = _interopRequireDefault(require("./raster"));
 
+var _TileDebugLayer = _interopRequireDefault(require("./tile/tileFactory/layers/TileDebugLayer"));
+
 var _earth = _interopRequireDefault(require("./earth"));
 
 var _mask = _interopRequireDefault(require("./mask"));
 
 var _wind = _interopRequireDefault(require("./wind"));
 
-var _tileTest = _interopRequireDefault(require("./tile/tileFactory/layers/tileTest"));
-
 var _DataMappingPlugin = _interopRequireDefault(require("./plugins/DataMappingPlugin"));
 
 var _DataSourcePlugin = _interopRequireDefault(require("./plugins/DataSourcePlugin"));

package/lib/line/index.js

@@ -7,6 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -23,8 +29,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 
-var _utils = require("../tile/utils");
-
 var _models = _interopRequireDefault(require("./models"));
 
 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); }; }
@@ -70,24 +74,31 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
 
   (0, _createClass2.default)(LineLayer, [{
     key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var shape = this.getModelType();
-      this.layerModel = new _models.default[shape](this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
+    value: function () {
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var shape;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                shape = this.getModelType();
+                this.layerModel = new _models.default[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() {
@@ -106,7 +117,6 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
         greatcircle: {
           blend: 'additive'
         },
-        vectorline: {},
         tileLine: {},
         halfLine: {},
         earthArc3d: {}
@@ -122,16 +132,33 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
         return this.layerType;
       }
 
-      var parserType = this.layerSource.getParserType();
-
-      if ((0, _utils.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 = (0, _objectSpread2.default)({}, data);
+          data.coordinates.map(function (d) {
+            dataArray.push((0, _objectSpread2.default)((0, _objectSpread2.default)({}, object), {}, {
+              coordinates: d
+            }));
+          });
+        } else {
+          dataArray.push(data);
+        }
+      });
+      return dataArray;
+    }
   }]);
   return LineLayer;
 }(_BaseLayer2.default);