@antv/l7-layers 2.10.3 → 2.10.5

package/es/utils/dataMappingStyle.js

@@ -19,7 +19,7 @@ function registerStyleAttribute(fieldName, layer, field, values, updateOptions)
  */
 
 
-function styleDataMapping(configToUpdate, layer) {
+function handleStyleDataMapping(configToUpdate, layer) {
   // 瓦片图层不需要进行样式数据映射
   if (layer.tileLayer || layer.isTileLayer) {
     return;
@@ -27,37 +27,37 @@ function styleDataMapping(configToUpdate, layer) {
 
   if (configToUpdate.opacity) {
     // 处理 style 中 opacity 属性的数据映射
-    floatStyleMapping('opacity', layer, configToUpdate.opacity);
+    handleStyleFloat('opacity', layer, configToUpdate.opacity);
   }
 
   if (configToUpdate.strokeWidth) {
     // 处理 style 中 strokeWidth 属性的数据映射
-    floatStyleMapping('strokeWidth', layer, configToUpdate.strokeWidth);
+    handleStyleFloat('strokeWidth', layer, configToUpdate.strokeWidth);
   }
 
   if (configToUpdate.strokeOpacity) {
     // 处理 style 中 strokeOpacity 属性的数据映射
-    floatStyleMapping('strokeOpacity', layer, configToUpdate.strokeOpacity);
+    handleStyleFloat('strokeOpacity', layer, configToUpdate.strokeOpacity);
   }
 
   if (configToUpdate.stroke) {
     // 处理 style 中 stroke (strokeColor) 属性的数据映射
-    colorStyleMapping('stroke', layer, configToUpdate.stroke);
+    handleStyleColor('stroke', layer, configToUpdate.stroke);
   }
 
   if (configToUpdate.offsets) {
     // 处理 style 中 offsets 属性的数据映射
-    offsetStyleMapping('offsets', layer, configToUpdate.offsets);
+    handleStyleOffsets('offsets', layer, configToUpdate.offsets);
   }
 
   if (configToUpdate.textOffset) {
     // 处理 style 中 textOffset 属性的数据映射
-    offsetStyleMapping('textOffset', layer, configToUpdate.textOffset);
+    handleStyleOffsets('textOffset', layer, configToUpdate.textOffset);
   }
 
   if (configToUpdate.thetaOffset) {
     // 处理 style 中 thetaOffset 属性的数据映射
-    floatStyleMapping('thetaOffset', layer, configToUpdate.thetaOffset);
+    handleStyleFloat('thetaOffset', layer, configToUpdate.thetaOffset);
   }
 }
 /**
@@ -65,14 +65,15 @@ function styleDataMapping(configToUpdate, layer) {
  */
 
 
-function floatStyleMapping(fieldName, layer, styleFloat) {
+function handleStyleFloat(fieldName, layer, styleFloat) {
   if (isString(styleFloat)) {
     // 如果传入的 styleFloat 是 string 类型，那么就认为其对应的是传入数据的字段
     registerStyleAttribute(fieldName, layer, styleFloat, function (value) {
       return value;
     });
-  } else if (isNumber(styleFloat)) {// 传入 number、默认值处理
-    // registerStyleAttribute(fieldName, layer, [styleFloat], undefined);
+  } else if (isNumber(styleFloat)) {
+    // 传入 number、默认值处理
+    registerStyleAttribute(fieldName, layer, [styleFloat], undefined);
   } else if (Array.isArray(styleFloat) && styleFloat.length === 2) {
     // 传入的 styleFloat 是长度为 2 的数组
     if (isString(styleFloat[0]) && isFunction(styleFloat[1])) {
@@ -98,7 +99,7 @@ function floatStyleMapping(fieldName, layer, styleFloat) {
  */
 
 
-function offsetStyleMapping(fieldName, layer, styleOffsets) {
+function handleStyleOffsets(fieldName, layer, styleOffsets) {
   if (isString(styleOffsets)) {
     // 如果传入的 styleOffsets 是 string 类型，那么就认为其对应的是传入数据的字段
     registerStyleAttribute(fieldName, layer, styleOffsets, function (value) {
@@ -123,9 +124,10 @@ function offsetStyleMapping(fieldName, layer, styleOffsets) {
  */
 
 
-function colorStyleMapping(fieldName, layer, styleColor) {
-  if (isString(styleColor)) {// 如果传入的 styleColor 是 string 类型，那么就认为其是颜色值
-    // registerStyleAttribute(fieldName, layer, styleColor, undefined);
+function handleStyleColor(fieldName, layer, styleColor) {
+  if (isString(styleColor)) {
+    // 如果传入的 styleColor 是 string 类型，那么就认为其是颜色值
+    registerStyleAttribute(fieldName, layer, styleColor, undefined);
   } else if (Array.isArray(styleColor) && styleColor.length === 2) {
     // 传入的 styleColor 是长度为 2 的数组
     if (isString(styleColor[0]) && isFunction(styleColor[1])) {
@@ -144,4 +146,4 @@ function colorStyleMapping(fieldName, layer, styleColor) {
   }
 }
 
-export { styleDataMapping, floatStyleMapping, colorStyleMapping };
+export { handleStyleDataMapping, handleStyleFloat, handleStyleColor };

package/es/utils/layerData.js

@@ -1,6 +1,6 @@
 import { Version } from '@antv/l7-maps';
 import Source from '@antv/l7-source';
-import { normalize, rgb2arr } from '@antv/l7-utils';
+import { isColor, normalize, rgb2arr } from '@antv/l7-utils';
 import { cloneDeep } from 'lodash';
 
 function getArrowPoints(p1, p2) {
@@ -91,7 +91,7 @@ function unProjectCoordinates(coordinates, mapService) {
   }
 }
 
-function applyAttributeMapping(attribute, record) {
+function applyAttributeMapping(attribute, record, minimumColor) {
   var _attribute$scale;
 
   if (!attribute.scale) {
@@ -111,10 +111,15 @@ function applyAttributeMapping(attribute, record) {
     }
   });
   var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
+
+  if (attribute.name === 'color' && !isColor(mappingResult[0])) {
+    return [minimumColor];
+  }
+
   return mappingResult;
 }
 
-function mapping(attributes, data, fontService, mapService, layer) {
+function mapping(attributes, data, fontService, mapService, minimumColor, layer) {
   var _ref2 = layer === null || layer === void 0 ? void 0 : layer.getLayerConfig(),
       _ref2$arrow = _ref2.arrow,
       arrow = _ref2$arrow === void 0 ? {
@@ -129,7 +134,7 @@ function mapping(attributes, data, fontService, mapService, layer) {
     attributes.filter(function (attribute) {
       return attribute.scale !== undefined;
     }).forEach(function (attribute) {
-      var values = applyAttributeMapping(attribute, record);
+      var values = applyAttributeMapping(attribute, record, minimumColor);
       attribute.needRemapping = false; // TODO: 支持每个属性配置 postprocess
 
       if (attribute.name === 'color') {
@@ -164,10 +169,11 @@ function mapping(attributes, data, fontService, mapService, layer) {
 
 export function calculateData(layer, fontService, mapService, styleAttributeService, data, options) {
   var source = new Source(data, options);
+  var bottomColor = layer.getBottomColor();
   var attributes = styleAttributeService.getLayerStyleAttributes() || [];
   var dataArray = source.data.dataArray;
   var filterData = dataArray;
-  var mappedEncodeData = mapping(attributes, filterData, fontService, mapService, layer);
+  var mappedEncodeData = mapping(attributes, filterData, fontService, mapService, bottomColor, layer);
   source.destroy();
   return mappedEncodeData;
 }

package/es/wind/index.d.ts

@@ -3,8 +3,9 @@ import { IWindLayerStyleOptions } from '../core/interface';
 import { WindModelType } from './models';
 export default class WindLayer extends BaseLayer<IWindLayerStyleOptions> {
     type: string;
-    buildModels(): Promise<void>;
+    buildModels(): void;
+    rebuildModels(): void;
     renderModels(): this;
     protected getDefaultConfig(): {};
-    getModelType(): WindModelType;
+    protected getModelType(): WindModelType;
 }

package/es/wind/index.js

@@ -1,4 +1,3 @@
-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";
@@ -6,7 +5,6 @@ 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); }; }
 
@@ -38,32 +36,24 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(WindLayer, [{
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var modelType;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                modelType = this.getModelType();
-                this.layerModel = new WindModels[modelType](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
+    value: function buildModels() {
+      var _this2 = this;
+
+      var modelType = this.getModelType();
+      this.layerModel = new WindModels[modelType](this);
+      this.layerModel.initModels(function (models) {
+        _this2.dispatchModelLoad(models);
+      });
+    }
+  }, {
+    key: "rebuildModels",
+    value: function rebuildModels() {
+      var _this3 = this;
 
-      return buildModels;
-    }()
+      this.layerModel.buildModels(function (models) {
+        _this3.dispatchModelLoad(models);
+      });
+    }
   }, {
     key: "renderModels",
     value: function renderModels() {

package/es/wind/models/wind.d.ts

@@ -10,12 +10,12 @@ export default class WindModel extends BaseModel {
     private cacheZoom;
     render(): void;
     getUninforms(): IModelUniform;
-    initModels(): Promise<IModel[]>;
+    initModels(callbackModel: (models: IModel[]) => void): void;
     getWindSize(): {
         imageWidth: number;
         imageHeight: number;
     };
-    buildModels(): Promise<IModel[]>;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
     private getZoomScale;

package/es/wind/models/wind.js

@@ -1,4 +1,3 @@
-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";
@@ -6,7 +5,6 @@ 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); }; }
 
@@ -75,99 +73,103 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _source$data,
-            _source$data2,
-            _source$data2$images,
-            _this3 = this;
-
-        var _ref, _ref$uMin, uMin, _ref$uMax, uMax, _ref$vMin, vMin, _ref$vMax, vMax, _ref$fadeOpacity, fadeOpacity, _ref$speedFactor, speedFactor, _ref$dropRate, dropRate, _ref$dropRateBump, dropRateBump, _ref$rampColors, rampColors, _ref$sizeScale, sizeScale, _ref$mask, mask, _ref$maskInside, maskInside, createTexture2D, source, glContext, model;
-
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _ref = this.layer.getLayerConfig(), _ref$uMin = _ref.uMin, uMin = _ref$uMin === void 0 ? -21.32 : _ref$uMin, _ref$uMax = _ref.uMax, uMax = _ref$uMax === void 0 ? 26.8 : _ref$uMax, _ref$vMin = _ref.vMin, vMin = _ref$vMin === void 0 ? -21.57 : _ref$vMin, _ref$vMax = _ref.vMax, vMax = _ref$vMax === void 0 ? 21.42 : _ref$vMax, _ref$fadeOpacity = _ref.fadeOpacity, fadeOpacity = _ref$fadeOpacity === void 0 ? 0.996 : _ref$fadeOpacity, _ref$speedFactor = _ref.speedFactor, speedFactor = _ref$speedFactor === void 0 ? 0.25 : _ref$speedFactor, _ref$dropRate = _ref.dropRate, dropRate = _ref$dropRate === void 0 ? 0.003 : _ref$dropRate, _ref$dropRateBump = _ref.dropRateBump, dropRateBump = _ref$dropRateBump === void 0 ? 0.01 : _ref$dropRateBump, _ref$rampColors = _ref.rampColors, rampColors = _ref$rampColors === void 0 ? defaultRampColors : _ref$rampColors, _ref$sizeScale = _ref.sizeScale, sizeScale = _ref$sizeScale === void 0 ? 0.5 : _ref$sizeScale, _ref$mask = _ref.mask, mask = _ref$mask === void 0 ? false : _ref$mask, _ref$maskInside = _ref.maskInside, maskInside = _ref$maskInside === void 0 ? true : _ref$maskInside;
-                createTexture2D = this.rendererService.createTexture2D;
-                source = this.layer.getSource();
-                this.texture = createTexture2D({
-                  height: 0,
-                  width: 0
-                });
-                this.cacheZoom = Math.floor(this.mapService.getZoom());
-                glContext = this.rendererService.getGLContext();
-                this.imageCoords = (_source$data = source.data) === null || _source$data === void 0 ? void 0 : _source$data.dataArray[0].coordinates;
-                (_source$data2 = source.data) === null || _source$data2 === void 0 ? void 0 : (_source$data2$images = _source$data2.images) === null || _source$data2$images === void 0 ? void 0 : _source$data2$images.then(function (imageData) {
-                  var _this3$texture;
-
-                  _this3.sizeScale = sizeScale * _this3.getZoomScale();
-
-                  var _this3$getWindSize = _this3.getWindSize(),
-                      imageWidth = _this3$getWindSize.imageWidth,
-                      imageHeight = _this3$getWindSize.imageHeight;
-
-                  var options = {
-                    glContext: glContext,
-                    imageWidth: imageWidth,
-                    imageHeight: imageHeight,
-                    fadeOpacity: fadeOpacity,
-                    speedFactor: speedFactor,
-                    dropRate: dropRate,
-                    dropRateBump: dropRateBump,
-                    rampColors: rampColors
-                  };
-                  _this3.wind = new Wind(options); // imageData[0] 风场图
-
-                  _this3.wind.setWind({
-                    uMin: uMin,
-                    uMax: uMax,
-                    vMin: vMin,
-                    vMax: vMax,
-                    image: imageData[0]
-                  });
-
-                  (_this3$texture = _this3.texture) === null || _this3$texture === void 0 ? void 0 : _this3$texture.destroy();
-                  _this3.texture = createTexture2D({
-                    width: imageWidth,
-                    height: imageHeight
-                  });
-
-                  _this3.layerService.reRender();
-                });
-                _context.next = 10;
-                return this.layer.buildLayerModel({
-                  moduleName: 'wind',
-                  vertexShader: WindVert,
-                  fragmentShader: WindFrag,
-                  triangulation: RasterImageTriangulation,
-                  primitive: gl.TRIANGLES,
-                  depth: {
-                    enable: false
-                  },
-                  stencil: getMask(mask, maskInside),
-                  blend: this.getBlend()
-                });
-
-              case 10:
-                model = _context.sent;
-                this.colorModel = model;
-                return _context.abrupt("return", [model]);
-
-              case 13:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
+    value: function initModels(callbackModel) {
+      var _source$data,
+          _source$data2,
+          _source$data2$images,
+          _this3 = this;
+
+      var _ref = this.layer.getLayerConfig(),
+          _ref$uMin = _ref.uMin,
+          uMin = _ref$uMin === void 0 ? -21.32 : _ref$uMin,
+          _ref$uMax = _ref.uMax,
+          uMax = _ref$uMax === void 0 ? 26.8 : _ref$uMax,
+          _ref$vMin = _ref.vMin,
+          vMin = _ref$vMin === void 0 ? -21.57 : _ref$vMin,
+          _ref$vMax = _ref.vMax,
+          vMax = _ref$vMax === void 0 ? 21.42 : _ref$vMax,
+          _ref$fadeOpacity = _ref.fadeOpacity,
+          fadeOpacity = _ref$fadeOpacity === void 0 ? 0.996 : _ref$fadeOpacity,
+          _ref$speedFactor = _ref.speedFactor,
+          speedFactor = _ref$speedFactor === void 0 ? 0.25 : _ref$speedFactor,
+          _ref$dropRate = _ref.dropRate,
+          dropRate = _ref$dropRate === void 0 ? 0.003 : _ref$dropRate,
+          _ref$dropRateBump = _ref.dropRateBump,
+          dropRateBump = _ref$dropRateBump === void 0 ? 0.01 : _ref$dropRateBump,
+          _ref$rampColors = _ref.rampColors,
+          rampColors = _ref$rampColors === void 0 ? defaultRampColors : _ref$rampColors,
+          _ref$sizeScale = _ref.sizeScale,
+          sizeScale = _ref$sizeScale === void 0 ? 0.5 : _ref$sizeScale,
+          _ref$mask = _ref.mask,
+          mask = _ref$mask === void 0 ? false : _ref$mask,
+          _ref$maskInside = _ref.maskInside,
+          maskInside = _ref$maskInside === void 0 ? true : _ref$maskInside;
+
+      var createTexture2D = this.rendererService.createTexture2D;
+      var source = this.layer.getSource();
+      this.texture = createTexture2D({
+        height: 0,
+        width: 0
+      });
+      this.cacheZoom = Math.floor(this.mapService.getZoom());
+      var glContext = this.rendererService.getGLContext();
+      this.imageCoords = (_source$data = source.data) === null || _source$data === void 0 ? void 0 : _source$data.dataArray[0].coordinates;
+      (_source$data2 = source.data) === null || _source$data2 === void 0 ? void 0 : (_source$data2$images = _source$data2.images) === null || _source$data2$images === void 0 ? void 0 : _source$data2$images.then(function (imageData) {
+        var _this3$texture;
+
+        _this3.sizeScale = sizeScale * _this3.getZoomScale();
+
+        var _this3$getWindSize = _this3.getWindSize(),
+            imageWidth = _this3$getWindSize.imageWidth,
+            imageHeight = _this3$getWindSize.imageHeight;
+
+        var options = {
+          glContext: glContext,
+          imageWidth: imageWidth,
+          imageHeight: imageHeight,
+          fadeOpacity: fadeOpacity,
+          speedFactor: speedFactor,
+          dropRate: dropRate,
+          dropRateBump: dropRateBump,
+          rampColors: rampColors
+        };
+        _this3.wind = new Wind(options); // imageData[0] 风场图
+
+        _this3.wind.setWind({
+          uMin: uMin,
+          uMax: uMax,
+          vMin: vMin,
+          vMax: vMax,
+          image: imageData[0]
+        });
 
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
+        (_this3$texture = _this3.texture) === null || _this3$texture === void 0 ? void 0 : _this3$texture.destroy();
+        _this3.texture = createTexture2D({
+          width: imageWidth,
+          height: imageHeight
+        });
 
-      return initModels;
-    }()
+        _this3.layerService.reRender();
+      });
+      this.layer.buildLayerModel({
+        moduleName: 'wind',
+        vertexShader: WindVert,
+        fragmentShader: WindFrag,
+        triangulation: RasterImageTriangulation,
+        primitive: gl.TRIANGLES,
+        depth: {
+          enable: false
+        },
+        stencil: getMask(mask, maskInside),
+        blend: this.getBlend()
+      }).then(function (model) {
+        _this3.colorModel = model;
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "getWindSize",
     value: function getWindSize() {
@@ -182,32 +184,9 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        return _regeneratorRuntime.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;
-    }()
+    value: function buildModels(callbackModel) {
+      this.initModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {
@@ -317,16 +296,18 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
       var _ref3 = this.layer.getLayerConfig(),
           opacity = _ref3.opacity;
 
-      this.layerService.beforeRenderData(this.layer);
-      this.layer.hooks.beforeRender.call();
-      this.layerService.renderMask(this.layer.masks);
+      this.layer.masks.map(function (m) {
+        m.hooks.beforeRenderData.call();
+        m.hooks.beforeRender.call();
+        m.render();
+        m.hooks.afterRender.call();
+      });
       (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 ? void 0 : _this$colorModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_texture: this.texture
         }
       });
-      this.layer.hooks.afterRender.call();
     }
   }]);
 

package/lib/Geometry/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"));
@@ -67,32 +63,24 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
 
   (0, _createClass2.default)(GeometryLayer, [{
     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 _models.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);
-      }
+    value: function buildModels() {
+      var _this2 = this;
+
+      var modelType = this.getModelType();
+      this.layerModel = new _models.default[modelType](this);
+      this.layerModel.initModels(function (models) {
+        _this2.dispatchModelLoad(models);
+      });
+    }
+  }, {
+    key: "rebuildModels",
+    value: function rebuildModels() {
+      var _this3 = this;
 
-      return buildModels;
-    }()
+      this.layerModel.buildModels(function (models) {
+        _this3.dispatchModelLoad(models);
+      });
+    }
   }, {
     key: "getDefaultConfig",
     value: function getDefaultConfig() {