@antv/l7-layers 2.10.5 → 2.10.7

package/es/raster/index.js

@@ -1,3 +1,4 @@
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -5,6 +6,7 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -36,24 +38,32 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(RaterLayer, [{
     key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var modelType = this.getModelType();
-      this.layerModel = new RasterModels[modelType](this);
-      this.layerModel.initModels(function (models) {
-        _this2.dispatchModelLoad(models);
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var modelType;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                modelType = this.getModelType();
+                this.layerModel = new RasterModels[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() {
@@ -62,7 +72,7 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
         raster: {},
         rasterRgb: {},
         raster3d: {},
-        rasterTile: {}
+        rasterTerrainRgb: {}
       };
       return defaultConfig[type];
     }
@@ -79,8 +89,8 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
         case 'rasterRgb':
           return 'rasterRgb';
 
-        case 'rasterTile':
-          return 'rasterTile';
+        case 'image':
+          return 'rasterTerrainRgb';
 
         default:
           return 'raster';

package/es/raster/models/index.d.ts

@@ -1,4 +1,4 @@
-export declare type RasterModelType = 'raster' | 'raster3d' | 'rasterTile' | 'rasterRgb';
+export declare type RasterModelType = 'raster' | 'raster3d' | 'rasterRgb' | 'rasterTerrainRgb';
 declare const RasterModels: {
     [key in RasterModelType]: any;
 };

package/es/raster/models/index.js

@@ -1,10 +1,10 @@
-import RasterTileModel from "../../tile/models/tileModel";
 import RasterModel from "./raster";
 import RasterRgbModel from "./rasterRgb";
+import RasterTerrainRGB from "./rasterTerrainRgb";
 var RasterModels = {
   raster: RasterModel,
   rasterRgb: RasterRgbModel,
   raster3d: RasterModel,
-  rasterTile: RasterTileModel
+  rasterTerrainRgb: RasterTerrainRGB
 };
 export default RasterModels;

package/es/raster/models/raster.d.ts

@@ -14,8 +14,8 @@ export default class RasterModel extends BaseModel {
         u_colorTexture: ITexture2D;
     };
     private getRasterData;
-    initModels(callbackModel: (models: IModel[]) => void): Promise<void>;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
     private updateColorTexture;

package/es/raster/models/raster.js

@@ -12,12 +12,11 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import { AttributeType, gl } from '@antv/l7-core';
 import { generateColorRamp, getMask } from '@antv/l7-utils';
-import { isEqual } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/raster_2d_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\n\n\n\n// float getBlurIndusty() {\n//   vec2 u_ViewportSize = vec2(1024);\n\n//     float vW = 2.0/u_ViewportSize.x;\n//     float vH = 2.0/u_ViewportSize.y;\n//     vec2 vUv = v_texCoord;\n//     float i11 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y + 1.0 * vH) ).r;\n//     float i12 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y + 1.0 * vH) ).r;\n//     float i13 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y + 1.0 * vH) ).r;\n\n//     float i21 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y) ).r;\n//     float i22 = texture2D( u_texture, vec2( vUv.x , vUv.y) ).r;\n//     float i23 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y) ).r;\n\n//     float i31 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y-1.0*vH) ).r;\n//     float i32 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y-1.0*vH) ).r;\n//     float i33 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y-1.0*vH) ).r;\n\n//     return(\n//         i11 + \n//         i12 + \n//         i13 + \n//         i21 + \n//         i21 + \n//         i22 + \n//         i23 + \n//         i31 + \n//         i32 + \n//         i33\n//         )/9.0;\n// }\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n\n  // float value = getBlurIndusty();\n\n\n  if (value == u_noDataValue)\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n    gl_FragColor = vec4(0, 0, 0, 0);\n  else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n  }\n}\n";
+var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n    gl_FragColor = vec4(0, 0, 0, 0);\n  else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n  }\n}\n";
 
 /* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
 var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
@@ -49,11 +48,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
           domain = _ref$domain === void 0 ? [0, 1] : _ref$domain,
           rampColors = _ref.rampColors;
 
-      if (!isEqual(this.rampColors, rampColors)) {
-        this.updateColorTexture();
-        this.rampColors = rampColors;
-      }
-
+      this.colorTexture = this.layer.textureService.getColorTexture(rampColors);
       return {
         u_opacity: opacity || 1,
         u_texture: this.texture,
@@ -117,14 +112,14 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initModels",
     value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(callbackModel) {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, rampColorsData, rampColors, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, imageData;
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
 
         return _regeneratorRuntime.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, rampColorsData = _ref2.rampColorsData, rampColors = _ref2.rampColors;
+                _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;
                 parserDataItem = source.data.dataArray[0];
@@ -144,14 +139,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   type: gl.FLOAT // aniso: 4,
 
                 });
-                imageData = rampColorsData ? rampColorsData : generateColorRamp(rampColors);
-                this.colorTexture = createTexture2D({
-                  data: imageData.data,
-                  width: imageData.width,
-                  height: imageData.height,
-                  flipY: false
-                });
-                this.layer.buildLayerModel({
+                _context2.next = 13;
+                return this.layer.buildLayerModel({
                   moduleName: 'rasterImageData',
                   vertexShader: rasterVert,
                   fragmentShader: rasterFrag,
@@ -161,14 +150,13 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                     enable: false
                   },
                   stencil: getMask(mask, maskInside)
-                }).then(function (model) {
-                  callbackModel([model]);
-                }).catch(function (err) {
-                  console.warn(err);
-                  callbackModel([]);
                 });
 
-              case 14:
+              case 13:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 15:
               case "end":
                 return _context2.stop();
             }
@@ -176,7 +164,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         }, _callee2, this);
       }));
 
-      function initModels(_x2) {
+      function initModels() {
         return _initModels.apply(this, arguments);
       }
 
@@ -184,9 +172,32 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return this.initModels();
+
+              case 2:
+                return _context3.abrupt("return", _context3.sent);
+
+              case 3:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {

package/es/raster/models/rasterRgb.d.ts

@@ -2,19 +2,18 @@ import { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class RasterModel extends BaseModel {
     protected texture: ITexture2D;
-    protected channelRMax: number;
-    protected channelGMax: number;
-    protected channelBMax: number;
+    protected dataOption: any;
     getUninforms(): {
         u_opacity: number;
         u_texture: ITexture2D;
-        u_channelRMax: number;
-        u_channelGMax: number;
-        u_channelBMax: number;
+        u_noDataValue: number;
+        u_rminmax: any;
+        u_gminmax: any;
+        u_bminmax: any;
     };
     private getRasterData;
-    initModels(callbackModel: (models: IModel[]) => void): Promise<void>;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
 }

package/es/raster/models/rasterRgb.js

@@ -1,3 +1,5 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
@@ -6,6 +8,8 @@ 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";
+var _excluded = ["data"],
+    _excluded2 = ["rasterData"];
 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); }; }
@@ -18,7 +22,7 @@ import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/raster_rgb_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform float u_channelRMax: 256.;\nuniform float u_channelGMax: 256.;\nuniform float u_channelBMax: 256.;\nvarying vec2 v_texCoord;\n\nvoid main() {\n  vec3 rgb = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).rgb;\n  gl_FragColor = vec4(rgb.r/u_channelRMax, rgb.g/u_channelGMax, rgb.b/u_channelBMax, u_opacity);\n}";
+var rasterFrag = "precision mediump float;\nuniform vec2 u_rminmax: vec2(0,255); \nuniform vec2 u_gminmax: vec2(0,255);\nuniform vec2 u_bminmax: vec2(0,255);\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform float u_noDataValue : 0.0;\nvarying vec2 v_texCoord;\n\nvoid main() {\n  vec3 rgb = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).rgb;\n  if(rgb == vec3(u_noDataValue)) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    gl_FragColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);\n  }\n \n}";
 
 /* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
 var rasterVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
@@ -39,11 +43,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
 
     _this = _super.call.apply(_super, [this].concat(args));
 
-    _defineProperty(_assertThisInitialized(_this), "channelRMax", 256);
-
-    _defineProperty(_assertThisInitialized(_this), "channelGMax", 256);
-
-    _defineProperty(_assertThisInitialized(_this), "channelBMax", 256);
+    _defineProperty(_assertThisInitialized(_this), "dataOption", {});
 
     return _this;
   }
@@ -54,23 +54,27 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
       var _ref = this.layer.getLayerConfig(),
           _ref$opacity = _ref.opacity,
           opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-          channelRMax = _ref.channelRMax,
-          channelGMax = _ref.channelGMax,
-          channelBMax = _ref.channelBMax;
+          _ref$noDataValue = _ref.noDataValue,
+          noDataValue = _ref$noDataValue === void 0 ? 0 : _ref$noDataValue;
 
+      var _this$dataOption = this.dataOption,
+          rMinMax = _this$dataOption.rMinMax,
+          gMinMax = _this$dataOption.gMinMax,
+          bMinMax = _this$dataOption.bMinMax;
       return {
         u_opacity: opacity || 1,
         u_texture: this.texture,
-        u_channelRMax: channelRMax !== undefined ? channelRMax : this.channelRMax,
-        u_channelGMax: channelGMax !== undefined ? channelGMax : this.channelGMax,
-        u_channelBMax: channelBMax !== undefined ? channelBMax : this.channelBMax
+        u_noDataValue: noDataValue,
+        u_rminmax: rMinMax,
+        u_gminmax: gMinMax,
+        u_bminmax: bMinMax
       };
     }
   }, {
     key: "getRasterData",
     value: function () {
       var _getRasterData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(parserDataItem) {
-        var _yield$parserDataItem, rasterData, width, height, channelR, channelG, channelB;
+        var data, rescfg, _yield$parserDataItem, rasterData, rest;
 
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
@@ -81,11 +85,11 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   break;
                 }
 
-                return _context.abrupt("return", {
-                  data: parserDataItem.data,
-                  width: parserDataItem.width,
-                  height: parserDataItem.height
-                });
+                data = parserDataItem.data, rescfg = _objectWithoutProperties(parserDataItem, _excluded);
+                this.dataOption = rescfg;
+                return _context.abrupt("return", _objectSpread({
+                  data: data
+                }, rescfg));
 
               case 4:
                 _context.next = 6;
@@ -94,21 +98,24 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
               case 6:
                 _yield$parserDataItem = _context.sent;
                 rasterData = _yield$parserDataItem.rasterData;
-                width = _yield$parserDataItem.width;
-                height = _yield$parserDataItem.height;
-                channelR = _yield$parserDataItem.channelR;
-                channelG = _yield$parserDataItem.channelG;
-                channelB = _yield$parserDataItem.channelB;
-                this.channelRMax = channelR;
-                this.channelGMax = channelG;
-                this.channelBMax = channelB;
-                return _context.abrupt("return", {
-                  data: Array.from(rasterData),
-                  width: width,
-                  height: height
-                });
+                rest = _objectWithoutProperties(_yield$parserDataItem, _excluded2);
+                this.dataOption = rest;
 
-              case 17:
+                if (!Array.isArray(rasterData)) {
+                  _context.next = 14;
+                  break;
+                }
+
+                return _context.abrupt("return", _objectSpread({
+                  data: rasterData
+                }, rest));
+
+              case 14:
+                return _context.abrupt("return", _objectSpread({
+                  data: Array.from(rasterData)
+                }, rest));
+
+              case 15:
               case "end":
                 return _context.stop();
             }
@@ -125,8 +132,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initModels",
     value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(callbackModel) {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height;
+      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -152,7 +159,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   format: gl.RGB,
                   type: gl.FLOAT
                 });
-                this.layer.buildLayerModel({
+                _context2.next = 13;
+                return this.layer.buildLayerModel({
                   moduleName: 'rasterImageDataRGBA',
                   vertexShader: rasterVert,
                   fragmentShader: rasterFrag,
@@ -162,14 +170,13 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                     enable: false
                   },
                   stencil: getMask(mask, maskInside)
-                }).then(function (model) {
-                  callbackModel([model]);
-                }).catch(function (err) {
-                  console.warn(err);
-                  callbackModel([]);
                 });
 
-              case 12:
+              case 13:
+                model = _context2.sent;
+                return _context2.abrupt("return", [model]);
+
+              case 15:
               case "end":
                 return _context2.stop();
             }
@@ -177,7 +184,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         }, _callee2, this);
       }));
 
-      function initModels(_x2) {
+      function initModels() {
         return _initModels.apply(this, arguments);
       }
 
@@ -185,9 +192,32 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }()
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.initModels(callbackModel);
-    }
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return this.initModels();
+
+              case 2:
+                return _context3.abrupt("return", _context3.sent);
+
+              case 3:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
+      }));
+
+      function buildModels() {
+        return _buildModels.apply(this, arguments);
+      }
+
+      return buildModels;
+    }()
   }, {
     key: "clearModels",
     value: function clearModels() {

package/es/{image/models/tileDataImage.d.ts → raster/models/rasterTerrainRgb.d.ts}

@@ -1,10 +1,10 @@
 import { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
-export default class ImageDataModel extends BaseModel {
+export default class RasterTerrainRGB extends BaseModel {
     protected texture: ITexture2D;
     getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): Promise<IModel[]>;
     clearModels(): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;
 }