@antv/l7-layers 2.10.1 → 2.10.3

package/lib/image/models/dataImage.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"));
@@ -94,57 +98,71 @@ var ImageDataModel = /*#__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,
-          rampColorsData = _ref2.rampColorsData,
-          rampColors = _ref2.rampColors;
-
-      var source = this.layer.getSource();
-      var createTexture2D = this.rendererService.createTexture2D;
-      this.texture = createTexture2D({
-        height: 0,
-        width: 0
-      });
-      source.data.images.then(function (imageData) {
-        _this.texture = createTexture2D({
-          data: imageData[0],
-          width: imageData[0].width,
-          height: imageData[0].height
-        });
-
-        _this.layerService.reRender();
-      });
-      var rampImageData = rampColorsData ? rampColorsData : (0, _l7Utils.generateColorRamp)(rampColors);
-      this.colorTexture = createTexture2D({
-        data: rampImageData.data,
-        width: rampImageData.width,
-        height: rampImageData.height,
-        flipY: false
-      });
-      this.layer.buildLayerModel({
-        moduleName: 'RasterImage',
-        vertexShader: ImageVert,
-        fragmentShader: ImageFrag,
-        triangulation: _triangulation.RasterImageTriangulation,
-        primitive: _l7Core.gl.TRIANGLES,
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend(),
-        stencil: (0, _l7Utils.getMask)(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
+    value: function () {
+      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _this = this;
+
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, rampColorsData, rampColors, source, createTexture2D, rampImageData, 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, rampColorsData = _ref2.rampColorsData, rampColors = _ref2.rampColors;
+                source = this.layer.getSource();
+                createTexture2D = this.rendererService.createTexture2D;
+                this.texture = createTexture2D({
+                  height: 0,
+                  width: 0
+                });
+                source.data.images.then(function (imageData) {
+                  _this.texture = createTexture2D({
+                    data: imageData[0],
+                    width: imageData[0].width,
+                    height: imageData[0].height
+                  });
+
+                  _this.layerService.reRender();
+                });
+                rampImageData = rampColorsData ? rampColorsData : (0, _l7Utils.generateColorRamp)(rampColors);
+                this.colorTexture = createTexture2D({
+                  data: rampImageData.data,
+                  width: rampImageData.width,
+                  height: rampImageData.height,
+                  flipY: false
+                });
+                _context.next = 9;
+                return this.layer.buildLayerModel({
+                  moduleName: 'RasterImage',
+                  vertexShader: ImageVert,
+                  fragmentShader: ImageFrag,
+                  triangulation: _triangulation.RasterImageTriangulation,
+                  primitive: _l7Core.gl.TRIANGLES,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend(),
+                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                });
+
+              case 9:
+                model = _context.sent;
+                return _context.abrupt("return", [model]);
+
+              case 11:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, this);
+      }));
+
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+
+      return initModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -155,9 +173,32 @@ var ImageDataModel = /*#__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/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,89 @@ 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, 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) {
+                  // @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();
+                  };
+                } 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();
+                  });
+                }
+
+                _context.next = 7;
+                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 7:
+                model = _context.sent;
+                return _context.abrupt("return", [model]);
+
+              case 9:
+              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 +154,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/tileDataImage.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"));
@@ -93,48 +97,64 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      var _this = this;
+    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, 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
+                });
+                source.data.images.then(function (imageData) {
+                  _this.texture = createTexture2D({
+                    data: imageData[0],
+                    width: imageData[0].width,
+                    height: imageData[0].height
+                  });
+
+                  _this.layerService.reRender();
+                });
+                _context.next = 7;
+                return this.layer.buildLayerModel({
+                  moduleName: 'RasterTileDataImage',
+                  vertexShader: ImageVert,
+                  fragmentShader: ImageFrag,
+                  triangulation: _triangulation.RasterImageTriangulation,
+                  primitive: _l7Core.gl.TRIANGLES,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend(),
+                  stencil: (0, _l7Utils.getMask)(mask, maskInside)
+                });
+
+              case 7:
+                model = _context.sent;
+                return _context.abrupt("return", [model]);
+
+              case 9:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, 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;
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
 
-      var source = this.layer.getSource();
-      var createTexture2D = this.rendererService.createTexture2D;
-      this.texture = createTexture2D({
-        height: 0,
-        width: 0
-      });
-      source.data.images.then(function (imageData) {
-        _this.texture = createTexture2D({
-          data: imageData[0],
-          width: imageData[0].width,
-          height: imageData[0].height
-        });
-
-        _this.layerService.reRender();
-      });
-      this.layer.buildLayerModel({
-        moduleName: 'RasterTileDataImage',
-        vertexShader: ImageVert,
-        fragmentShader: ImageFrag,
-        triangulation: _triangulation.RasterImageTriangulation,
-        primitive: _l7Core.gl.TRIANGLES,
-        depth: {
-          enable: false
-        },
-        blend: this.getBlend(),
-        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() {
@@ -144,9 +164,32 @@ var ImageDataModel = /*#__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/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"));
@@ -25,8 +31,6 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 
 var _models = _interopRequireDefault(require("./models"));
 
-var _utils = require("../tile/utils");
-
 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; } }
@@ -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);