@antv/l7-layers 2.10.2 → 2.10.4

package/lib/point/index.js

@@ -7,10 +7,6 @@ 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"));
@@ -27,6 +23,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 
+var _utils = require("../tile/utils");
+
 var _index = _interopRequireDefault(require("./models/index"));
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -70,57 +68,24 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
 
   (0, _createClass2.default)(PointLayer, [{
     key: "buildModels",
-    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);
-      }));
+    value: function buildModels() {
+      var _this2 = this;
 
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
+      var modelType = this.getModelType();
+      this.layerModel = new _index.default[modelType](this);
+      this.layerModel.initModels(function (models) {
+        _this2.dispatchModelLoad(models);
+      });
+    }
   }, {
     key: "rebuildModels",
-    value: function () {
-      var _rebuildModels = (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.buildModels();
-
-              case 2:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function rebuildModels() {
-        return _rebuildModels.apply(this, arguments);
-      }
+    value: function rebuildModels() {
+      var _this3 = this;
 
-      return rebuildModels;
-    }()
+      this.layerModel.buildModels(function (models) {
+        _this3.dispatchModelLoad(models);
+      });
+    }
     /**
      * 在未传入数据的时候判断点图层的 shape 类型
      * @returns
@@ -143,10 +108,6 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
           return 'fill';
         }
 
-        if (values === 'text') {
-          return 'text';
-        }
-
         if (values && values instanceof Array) {
           var _iterator = _createForOfIteratorHelper(values),
               _step;
@@ -188,6 +149,7 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
         text: {
           blend: 'normal'
         },
+        vectorPoint: {},
         tile: {},
         tileText: {},
         earthFill: {},
@@ -198,7 +160,13 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
   }, {
     key: "getModelType",
     value: function getModelType() {
-      //  2D、 3d、 shape、image、text、normal、
+      var parserType = this.layerSource.getParserType();
+
+      if ((0, _utils.isVectorTile)(parserType)) {
+        return 'vectorPoint';
+      } //  2D、 3d、 shape、image、text、normal、
+
+
       var layerData = this.getEncodedData();
 
       var _this$getLayerConfig2 = this.getLayerConfig(),

package/lib/point/models/earthExtrude.js

@@ -7,10 +7,6 @@ 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"));
@@ -177,79 +173,38 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     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.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;
-    }()
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$animateOption$r, repeat, model;
-
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                // GAODE1.x GAODE2.x MAPBOX
-                _ref2 = this.layer.getLayerConfig(), _ref2$animateOption$r = _ref2.animateOption.repeat, repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
-                this.raiseRepeat = repeat;
-                _context2.next = 4;
-                return this.layer.buildLayerModel({
-                  moduleName: 'pointEarthExtrude',
-                  vertexShader: pointExtrudeVert,
-                  fragmentShader: pointExtrudeFrag,
-                  triangulation: _triangulation.PointExtrudeTriangulation,
-                  depth: {
-                    enable: true
-                  },
-                  cull: {
-                    enable: true,
-                    face: (0, _l7Utils.getCullFace)(this.mapService.version)
-                  },
-                  blend: this.getBlend()
-                });
-
-              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;
-    }()
+    value: function buildModels(callbackModel) {
+      // GAODE1.x GAODE2.x MAPBOX
+      var _ref2 = this.layer.getLayerConfig(),
+          _ref2$animateOption$r = _ref2.animateOption.repeat,
+          repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
+
+      this.raiseRepeat = repeat;
+      this.layer.buildLayerModel({
+        moduleName: 'pointEarthExtrude',
+        vertexShader: pointExtrudeVert,
+        fragmentShader: pointExtrudeFrag,
+        triangulation: _triangulation.PointExtrudeTriangulation,
+        depth: {
+          enable: true
+        },
+        cull: {
+          enable: true,
+          face: (0, _l7Utils.getCullFace)(this.mapService.version)
+        },
+        blend: this.getBlend()
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {

package/lib/point/models/earthFill.js

@@ -7,14 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -143,72 +139,29 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     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.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;
-    }()
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var model;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                this.layer.triangulation = _triangulation.GlobelPointFillTriangulation;
-                _context2.next = 3;
-                return this.layer.buildLayerModel({
-                  moduleName: 'pointEarthFill',
-                  vertexShader: pointFillVert,
-                  fragmentShader: pointFillFrag,
-                  triangulation: _triangulation.GlobelPointFillTriangulation,
-                  depth: {
-                    enable: true
-                  },
-                  blend: this.getBlend()
-                });
-
-              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;
-    }()
+    value: function buildModels(callbackModel) {
+      this.layer.triangulation = _triangulation.GlobelPointFillTriangulation;
+      this.layer.buildLayerModel({
+        moduleName: 'pointEarthFill',
+        vertexShader: pointFillVert,
+        fragmentShader: pointFillFrag,
+        triangulation: _triangulation.GlobelPointFillTriangulation,
+        depth: {
+          enable: true
+        },
+        blend: this.getBlend()
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {

package/lib/point/models/extrude.js

@@ -175,47 +175,23 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     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.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;
-    }()
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "buildModels",
     value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref2, _ref2$depth, depth, _ref2$animateOption$r, repeat, model;
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(callbackModel) {
+        var _ref2, _ref2$depth, depth, _ref2$animateOption$r, repeat;
 
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+        return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context.prev = _context.next) {
               case 0:
                 // GAODE1.x GAODE2.x MAPBOX
                 _ref2 = this.layer.getLayerConfig(), _ref2$depth = _ref2.depth, depth = _ref2$depth === void 0 ? true : _ref2$depth, _ref2$animateOption$r = _ref2.animateOption.repeat, repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
                 this.raiseRepeat = repeat;
-                _context2.next = 4;
-                return this.layer.buildLayerModel({
+                this.layer.buildLayerModel({
                   moduleName: 'pointExtrude',
                   vertexShader: pointExtrudeVert,
                   fragmentShader: pointExtrudeFrag,
@@ -228,21 +204,22 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
                   depth: {
                     enable: depth
                   }
+                }).then(function (model) {
+                  callbackModel([model]);
+                }).catch(function (err) {
+                  console.warn(err);
+                  callbackModel([]);
                 });
 
-              case 4:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 6:
+              case 3:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee, this);
       }));
 
-      function buildModels() {
+      function buildModels(_x) {
         return _buildModels.apply(this, arguments);
       }
 

package/lib/point/models/fill.js

@@ -9,10 +9,10 @@ exports.default = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -179,33 +179,10 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     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:
-                this.updateUnit('l7size');
-                _context.next = 3;
-                return this.buildModels();
-
-              case 3:
-                return _context.abrupt("return", _context.sent);
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-
-      return initModels;
-    }()
+    value: function initModels(callbackModel) {
+      this.updateUnit('l7size');
+      this.buildModels(callbackModel);
+    }
     /**
      * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
      * @returns
@@ -253,20 +230,19 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "buildModels",
     value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, _ref3$animateOption, animateOption, _ref3$workerEnabled, workerEnabled, enablePicking, shape2d, _this$getShaders, frag, vert, type, model;
+      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(callbackModel) {
+        var _ref3, _ref3$mask, mask, _ref3$maskInside, maskInside, _ref3$animateOption, animateOption, _ref3$workerEnabled, workerEnabled, enablePicking, shape2d, _this$getShaders, frag, vert, type;
 
-        return _regenerator.default.wrap(function _callee2$(_context2) {
+        return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context.prev = _context.next) {
               case 0:
                 _ref3 = this.layer.getLayerConfig(), _ref3$mask = _ref3.mask, mask = _ref3$mask === void 0 ? false : _ref3$mask, _ref3$maskInside = _ref3.maskInside, maskInside = _ref3$maskInside === void 0 ? true : _ref3$maskInside, _ref3$animateOption = _ref3.animateOption, animateOption = _ref3$animateOption === void 0 ? {
                   enable: false
                 } : _ref3$animateOption, _ref3$workerEnabled = _ref3.workerEnabled, workerEnabled = _ref3$workerEnabled === void 0 ? false : _ref3$workerEnabled, enablePicking = _ref3.enablePicking, shape2d = _ref3.shape2d;
                 _this$getShaders = this.getShaders(animateOption), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
                 this.layer.triangulation = _l7Utils.PointFillTriangulation;
-                _context2.next = 5;
-                return this.layer.buildLayerModel({
+                this.layer.buildLayerModel({
                   moduleName: type,
                   vertexShader: vert,
                   fragmentShader: frag,
@@ -282,21 +258,22 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
                     enablePicking: enablePicking,
                     shape2d: shape2d
                   }
+                }).then(function (model) {
+                  callbackModel([model]);
+                }).catch(function (err) {
+                  console.warn(err);
+                  callbackModel([]);
                 });
 
-              case 5:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 7:
+              case 4:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
           }
-        }, _callee2, this);
+        }, _callee, this);
       }));
 
-      function buildModels() {
+      function buildModels(_x) {
         return _buildModels.apply(this, arguments);
       }
 
@@ -424,7 +401,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
 
       if (this.unit !== unit) {
         // l7size => meter
-        if (this.unit !== 'meter' && unit === 'meter' && version !== _l7Maps.Version.DEFUALT && version !== _l7Maps.Version.GLOBEL) {
+        if (this.unit !== 'meter' && unit === 'meter' && version !== _l7Maps.Version.L7MAP && version !== _l7Maps.Version.GLOBEL) {
           this.isMeter = true;
           this.calMeter2Coord(); // meter => l7size
         } else if (this.unit === 'meter' && unit !== 'meter') {