@antv/l7-layers 2.10.2 → 2.10.4

package/es/polygon/models/water.d.ts

@@ -8,8 +8,8 @@ export default class WaterModel extends BaseModel {
         u_opacity: number;
     };
     getAnimateUniforms(): IModelUniform;
-    initModels(): Promise<IModel[]>;
-    buildModels(): Promise<IModel[]>;
+    initModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
     private loadTexture;

package/es/polygon/models/water.js

@@ -1,11 +1,9 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _inherits from "@babel/runtime/helpers/esm/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 
 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); }; }
 
@@ -59,75 +57,36 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                this.loadTexture();
-                _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.loadTexture();
+      this.buildModels(callbackModel);
+    }
   }, {
     key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, 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;
-                _context2.next = 3;
-                return this.layer.buildLayerModel({
-                  moduleName: 'polygonWater',
-                  vertexShader: water_vert,
-                  fragmentShader: water_frag,
-                  triangulation: polygonTriangulation,
-                  primitive: gl.TRIANGLES,
-                  depth: {
-                    enable: false
-                  },
-                  stencil: getMask(mask, maskInside)
-                });
-
-              case 3:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 5:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
+    value: function buildModels(callbackModel) {
+      var _ref2 = this.layer.getLayerConfig(),
+          _ref2$mask = _ref2.mask,
+          mask = _ref2$mask === void 0 ? false : _ref2$mask,
+          _ref2$maskInside = _ref2.maskInside,
+          maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
+
+      this.layer.buildLayerModel({
+        moduleName: 'polygonWater',
+        vertexShader: water_vert,
+        fragmentShader: water_frag,
+        triangulation: polygonTriangulation,
+        primitive: gl.TRIANGLES,
+        depth: {
+          enable: false
+        },
+        stencil: getMask(mask, maskInside)
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {

package/es/polygon/shaders/extrude/polygon_extrude_frag.glsl

@@ -16,7 +16,8 @@ void main() {
   float sidey = styleMappingMat[3][0];
   float lightWeight = styleMappingMat[3][1];
 
-  if(isSide < 1.0) {
+  // Tip: 部分机型 GPU 计算精度兼容
+  if(isSide < 0.999) {
     // side face
     if(u_sidesurface < 1.0) {
       discard;

package/es/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl

@@ -16,7 +16,8 @@ void main() {
   float sidey = styleMappingMat[3][0];
   float lightWeight = styleMappingMat[3][1];
 
-  if(isSide < 1.0) {
+  // Tip: 部分机型 GPU 计算精度兼容
+  if(isSide < 0.999) {
     // side face
     if(u_sidesurface < 1.0) {
       discard;

package/es/polygon/shaders/extrude/polygon_extrudetex_frag.glsl

@@ -19,7 +19,8 @@ void main() {
   float topV = styleMappingMat[2][3];
 
   float sidey = styleMappingMat[3][0];
-  if(isSide < 1.0) {
+  // Tip: 部分机型 GPU 计算精度兼容
+  if(isSide < 0.999) {
     // side face
     if(u_sidesurface < 1.0) {
       discard;

package/es/raster/index.d.ts

@@ -3,7 +3,8 @@ import { IRasterLayerStyleOptions } from '../core/interface';
 import { RasterModelType } from './models/index';
 export default class RaterLayer extends BaseLayer<IRasterLayerStyleOptions> {
     type: string;
-    buildModels(): Promise<void>;
-    protected getDefaultConfig(): {} | {} | {};
-    getModelType(): RasterModelType;
+    buildModels(): void;
+    rebuildModels(): void;
+    protected getDefaultConfig(): {} | {} | {} | {};
+    protected getModelType(): RasterModelType;
 }

package/es/raster/index.js

@@ -1,12 +1,10 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
+import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
+import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
+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";
 
 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 RaterLayer = /*#__PURE__*/function (_BaseLayer) {
 
   _createClass(RaterLayer, [{
     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 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);
-      }
+    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;
 
-      return buildModels;
-    }()
+      this.layerModel.buildModels(function (models) {
+        _this3.dispatchModelLoad(models);
+      });
+    }
   }, {
     key: "getDefaultConfig",
     value: function getDefaultConfig() {
@@ -71,7 +61,8 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
       var defaultConfig = {
         raster: {},
         rasterRgb: {},
-        raster3d: {}
+        raster3d: {},
+        rasterTile: {}
       };
       return defaultConfig[type];
     }
@@ -88,6 +79,9 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
         case 'rasterRgb':
           return 'rasterRgb';
 
+        case 'rasterTile':
+          return 'rasterTile';
+
         default:
           return 'raster';
       }

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

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

package/es/raster/models/index.js

@@ -1,8 +1,10 @@
+import RasterTileModel from "../../tile/models/tileModel";
 import RasterModel from "./raster";
 import RasterRgbModel from "./rasterRgb";
 var RasterModels = {
   raster: RasterModel,
   rasterRgb: RasterRgbModel,
-  raster3d: RasterModel
+  raster3d: RasterModel,
+  rasterTile: RasterTileModel
 };
 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(): Promise<IModel[]>;
-    buildModels(): Promise<IModel[]>;
+    initModels(callbackModel: (models: IModel[]) => void): Promise<void>;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
     private updateColorTexture;

package/es/raster/models/raster.js

@@ -1,9 +1,9 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+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 _inherits from "@babel/runtime/helpers/esm/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 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); }; }
@@ -117,8 +117,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initModels",
     value: function () {
-      var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref2, _ref2$mask, mask, _ref2$maskInside, maskInside, rampColorsData, rampColors, source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, imageData, model;
+      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;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -151,8 +151,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   height: imageData.height,
                   flipY: false
                 });
-                _context2.next = 15;
-                return this.layer.buildLayerModel({
+                this.layer.buildLayerModel({
                   moduleName: 'rasterImageData',
                   vertexShader: rasterVert,
                   fragmentShader: rasterFrag,
@@ -162,13 +161,14 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                     enable: false
                   },
                   stencil: getMask(mask, maskInside)
+                }).then(function (model) {
+                  callbackModel([model]);
+                }).catch(function (err) {
+                  console.warn(err);
+                  callbackModel([]);
                 });
 
-              case 15:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 17:
+              case 14:
               case "end":
                 return _context2.stop();
             }
@@ -176,7 +176,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         }, _callee2, this);
       }));
 
-      function initModels() {
+      function initModels(_x2) {
         return _initModels.apply(this, arguments);
       }
 
@@ -184,32 +184,9 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }()
   }, {
     key: "buildModels",
-    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;
-    }()
+    value: function buildModels(callbackModel) {
+      this.initModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {

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

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

package/es/raster/models/rasterRgb.js

@@ -1,11 +1,11 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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";
+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); }; }
@@ -125,8 +125,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "initModels",
     value: function () {
-      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;
+      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;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -152,8 +152,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                   format: gl.RGB,
                   type: gl.FLOAT
                 });
-                _context2.next = 13;
-                return this.layer.buildLayerModel({
+                this.layer.buildLayerModel({
                   moduleName: 'rasterImageDataRGBA',
                   vertexShader: rasterVert,
                   fragmentShader: rasterFrag,
@@ -163,13 +162,14 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
                     enable: false
                   },
                   stencil: getMask(mask, maskInside)
+                }).then(function (model) {
+                  callbackModel([model]);
+                }).catch(function (err) {
+                  console.warn(err);
+                  callbackModel([]);
                 });
 
-              case 13:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 15:
+              case 12:
               case "end":
                 return _context2.stop();
             }
@@ -177,7 +177,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         }, _callee2, this);
       }));
 
-      function initModels() {
+      function initModels(_x2) {
         return _initModels.apply(this, arguments);
       }
 
@@ -185,32 +185,9 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     }()
   }, {
     key: "buildModels",
-    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;
-    }()
+    value: function buildModels(callbackModel) {
+      this.initModels(callbackModel);
+    }
   }, {
     key: "clearModels",
     value: function clearModels() {

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

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