@antv/l7-layers 2.13.5 → 2.13.7

package/es/plugins/DataSourcePlugin.js

@@ -5,7 +5,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 var _dec, _class;
 
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { TYPES } from '@antv/l7-core';
+import { IDebugLog, ILayerStage, TYPES } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
@@ -27,6 +27,7 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                layer.log(IDebugLog.SourceInitStart, ILayerStage.INIT);
                 source = layer.getSource();
 
                 if (!source) {
@@ -37,28 +38,31 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
                 }
 
                 if (!source.inited) {
-                  _context.next = 6;
+                  _context.next = 8;
                   break;
                 }
 
                 _this.updateClusterData(layer);
 
-                _context.next = 8;
+                layer.log(IDebugLog.SourceInitEnd, ILayerStage.INIT);
+                _context.next = 10;
                 break;
 
-              case 6:
-                _context.next = 8;
+              case 8:
+                _context.next = 10;
                 return new Promise(function (resolve) {
                   source.on('update', function (e) {
                     if (e.type === 'inited') {
                       _this.updateClusterData(layer);
+
+                      layer.log(IDebugLog.SourceInitEnd, ILayerStage.INIT);
                     }
 
                     resolve(null);
                   });
                 });
 
-              case 8:
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -67,7 +71,7 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
       }))); // 检测数据是否需要更新
 
       layer.hooks.beforeRenderData.tapPromise('DataSourcePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var neeUpdateCluster, dataSourceNeedUpdate;
+        var neeUpdateCluster, dataSourceNeedUpdate, needScale;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -75,9 +79,10 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
                 neeUpdateCluster = _this.updateClusterData(layer);
                 dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
                 layer.dataState.dataSourceNeedUpdate = false;
-                return _context2.abrupt("return", neeUpdateCluster || dataSourceNeedUpdate);
+                needScale = neeUpdateCluster || dataSourceNeedUpdate;
+                return _context2.abrupt("return", needScale);
 
-              case 4:
+              case 5:
               case "end":
                 return _context2.stop();
             }

package/es/plugins/FeatureScalePlugin.js

@@ -7,7 +7,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _scaleMap, _dec, _class;
 
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { ScaleTypes, StyleScaleType } from '@antv/l7-core';
+import { IDebugLog, ILayerStage, ScaleTypes, StyleScaleType } from '@antv/l7-core';
 import { extent } from 'd3-array';
 import * as d3interpolate from 'd3-interpolate';
 import * as d3 from 'd3-scale';
@@ -42,21 +42,25 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                layer.log(IDebugLog.ScaleInitStart, ILayerStage.INIT);
                 _this.scaleOptions = layer.getScaleOptions();
                 attributes = styleAttributeService.getLayerStyleAttributes();
                 dataArray = (_layer$getSource = layer.getSource()) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.data.dataArray;
 
                 if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
-                  _context.next = 7;
+                  _context.next = 8;
                   break;
                 }
 
                 return _context.abrupt("return");
 
-              case 7:
+              case 8:
                 _this.caculateScalesForAttributes(attributes || [], dataArray);
 
-              case 8:
+              case 9:
+                layer.log(IDebugLog.ScaleInitEnd, ILayerStage.INIT);
+
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -79,24 +83,26 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
                   return _context2.abrupt("return", flag);
 
                 case 2:
+                  layer.log(IDebugLog.ScaleInitStart, ILayerStage.UPDATE);
                   _this.scaleOptions = layer.getScaleOptions();
                   attributes = styleAttributeService.getLayerStyleAttributes();
                   dataArray = layer.getSource().data.dataArray;
 
                   if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
-                    _context2.next = 7;
+                    _context2.next = 8;
                     break;
                   }
 
                   return _context2.abrupt("return", true);
 
-                case 7:
+                case 8:
                   _this.caculateScalesForAttributes(attributes || [], dataArray);
 
+                  layer.log(IDebugLog.ScaleInitEnd, ILayerStage.UPDATE);
                   layer.layerModelNeedUpdate = true;
                   return _context2.abrupt("return", true);
 
-                case 10:
+                case 12:
                 case "end":
                   return _context2.stop();
               }

package/es/plugins/LayerModelPlugin.d.ts

@@ -4,6 +4,7 @@ import 'reflect-metadata';
  * Layer Model 初始化，更新，销毁
  */
 export default class LayerModelPlugin implements ILayerPlugin {
+    private build;
     initLayerModel(layer: ILayer): Promise<void>;
     prepareLayerModel(layer: ILayer): Promise<void>;
     apply(layer: ILayer): void;

package/es/plugins/LayerModelPlugin.js

@@ -5,6 +5,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 var _dec, _class;
 
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { IDebugLog, ILayerStage } from '@antv/l7-core';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
 import TileLayer from "../tile/tileLayer/BaseLayer";
@@ -18,9 +19,9 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
   }
 
   _createClass(LayerModelPlugin, [{
-    key: "initLayerModel",
+    key: "build",
     value: function () {
-      var _initLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
+      var _build = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -32,9 +33,6 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
                 return layer.buildModels();
 
               case 3:
-                layer.styleNeedUpdate = false;
-
-              case 4:
               case "end":
                 return _context.stop();
             }
@@ -42,36 +40,60 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
         }, _callee);
       }));
 
-      function initLayerModel(_x) {
-        return _initLayerModel.apply(this, arguments);
+      function build(_x) {
+        return _build.apply(this, arguments);
       }
 
-      return initLayerModel;
+      return build;
     }()
   }, {
-    key: "prepareLayerModel",
+    key: "initLayerModel",
     value: function () {
-      var _prepareLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layer) {
+      var _initLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layer) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                // 更新Model 配置项
-                layer.prepareBuildModel(); // clear layerModel resource
-                // 初始化 Model
+                _context2.next = 2;
+                return this.build(layer);
 
-                _context2.next = 3;
-                return layer.buildModels();
+              case 2:
+                layer.styleNeedUpdate = false;
 
               case 3:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2);
+        }, _callee2, this);
+      }));
+
+      function initLayerModel(_x2) {
+        return _initLayerModel.apply(this, arguments);
+      }
+
+      return initLayerModel;
+    }()
+  }, {
+    key: "prepareLayerModel",
+    value: function () {
+      var _prepareLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(layer) {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return this.build(layer);
+
+              case 2:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
       }));
 
-      function prepareLayerModel(_x2) {
+      function prepareLayerModel(_x3) {
         return _prepareLayerModel.apply(this, arguments);
       }
 
@@ -82,69 +104,75 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     value: function apply(layer) {
       var _this = this;
 
-      layer.hooks.init.tapPromise('LayerModelPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      layer.hooks.init.tapPromise('LayerModelPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
                 if (!layer.getSource().isTile) {
-                  _context3.next = 4;
+                  _context4.next = 4;
                   break;
                 }
 
                 layer.prepareBuildModel();
                 layer.tileLayer = new TileLayer(layer);
-                return _context3.abrupt("return");
+                return _context4.abrupt("return");
 
               case 4:
-                _context3.next = 6;
+                layer.log(IDebugLog.BuildModelStart, ILayerStage.INIT);
+                _context4.next = 7;
                 return _this.initLayerModel(layer);
 
-              case 6:
+              case 7:
+                layer.log(IDebugLog.BuildModelEnd, ILayerStage.INIT);
+
+              case 8:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3);
+        }, _callee4);
       })));
       layer.hooks.beforeRenderData.tapPromise('LayerModelPlugin', /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(flag) {
-          return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(flag) {
+          return _regeneratorRuntime.wrap(function _callee5$(_context5) {
             while (1) {
-              switch (_context4.prev = _context4.next) {
+              switch (_context5.prev = _context5.next) {
                 case 0:
                   if (flag) {
-                    _context4.next = 2;
+                    _context5.next = 2;
                     break;
                   }
 
-                  return _context4.abrupt("return", false);
+                  return _context5.abrupt("return", false);
 
                 case 2:
                   if (!layer.getSource().isTile) {
-                    _context4.next = 5;
+                    _context5.next = 5;
                     break;
                   }
 
                   layer.tileLayer = new TileLayer(layer);
-                  return _context4.abrupt("return", false);
+                  return _context5.abrupt("return", false);
 
                 case 5:
-                  _context4.next = 7;
+                  layer.log(IDebugLog.BuildModelStart, ILayerStage.UPDATE);
+                  _context5.next = 8;
                   return _this.prepareLayerModel(layer);
 
-                case 7:
-                  return _context4.abrupt("return", true);
-
                 case 8:
+                  layer.log(IDebugLog.BuildModelEnd, ILayerStage.UPDATE);
+                  return _context5.abrupt("return", true);
+
+                case 10:
                 case "end":
-                  return _context4.stop();
+                  return _context5.stop();
               }
             }
-          }, _callee4);
+          }, _callee5);
         }));
 
-        return function (_x3) {
+        return function (_x4) {
           return _ref2.apply(this, arguments);
         };
       }());

package/es/point/models/earthExtrude.js

@@ -164,13 +164,9 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/es/point/models/earthFill.js

@@ -129,13 +129,9 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/es/point/models/extrude.js

@@ -163,13 +163,9 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/es/point/models/normal.js

@@ -67,13 +67,9 @@ var NormalModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }
@@ -134,7 +130,9 @@ var NormalModel = /*#__PURE__*/function (_BaseModel) {
     }()
   }, {
     key: "clearModels",
-    value: function clearModels() {}
+    value: function clearModels() {
+      return;
+    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/es/point/models/radar.js

@@ -14,6 +14,7 @@ import { AttributeType, gl } from '@antv/l7-core';
 import { getMask } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
+import { SizeUnitType } from "../../core/interface";
 import { PointFillTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/radar/radar_frag.glsl' */
@@ -21,7 +22,6 @@ var pointFillFrag = "\nuniform float u_additive;\nuniform float u_opacity: 1.0;\
 
 /* babel-plugin-inline-import '../shaders/radar/radar_vert.glsl' */
 var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nuniform float u_speed: 1.0;\nuniform float u_time;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform int u_Size_Unit;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\nvarying vec2 v_exteude;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float newSize = setPickingSize(a_Size);\n\n  float time = u_time * u_speed;\n  mat2 rotateMatrix = mat2( \n    cos(time), sin(time), \n    -sin(time), cos(time)\n  );\n  v_exteude = rotateMatrix * a_Extrude.xy;\n\n  // unpack color(vec2)\n  v_color = a_Color;\n\n\n\n  // anti-alias\n  float blur = 0.0;\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);\n\n  if(u_Size_Unit == 1) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n  // radius(16-bit)\n  v_radius = newSize;\n\n  vec2 offset = (extrude.xy * (newSize));\n  vec3 aPosition = a_Position;\n  \n    // \u4E0D\u4EE5\u7C73\u4E3A\u5B9E\u9645\u5355\u4F4D\n  offset = project_pixel(offset);\n  \n  v_data = vec4(extrude.x, extrude.y, antialiasblur, -1.0);\n\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp *vec4(project_pos.xy + offset, 0.0, 1.0);\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n  }\n\n  setPickingColor(a_PickingColor);\n}\n";
-import { SizeUnitType } from "../../core/interface";
 
 var RadarModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(RadarModel, _BaseModel);
@@ -80,13 +80,9 @@ var RadarModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/es/point/models/simplePoint.js

@@ -119,13 +119,9 @@ var SimplePointModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/es/polygon/models/extrude.js

@@ -18,10 +18,10 @@ import BaseModel from "../../core/BaseModel";
 import { PolygonExtrudeTriangulation } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/extrude/polygon_extrude_frag.glsl' */
-var polygonExtrudeFrag = "uniform float u_opacity: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n#pragma include \"picking\"\n\nvoid main() {\n  float opacity = styleMappingMat[0][0];  \n  float isSide = styleMappingMat[0][3];\n  float sidey = styleMappingMat[3][0];\n  float lightWeight = styleMappingMat[3][1];\n\n  // Tip: \u90E8\u5206\u673A\u578B GPU \u8BA1\u7B97\u7CBE\u5EA6\u517C\u5BB9\n  if(isSide < 0.999) {\n    // side face\n    if(u_sidesurface < 1.0) {\n      discard;\n    }\n\n    if(u_linearColor == 1.0) {\n      vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);\n      linearColor.rgb *= lightWeight;\n      gl_FragColor = linearColor;\n    } else {\n      gl_FragColor = v_Color;\n    }\n\n  } else {\n     // top face\n    if(u_topsurface < 1.0) {\n      discard;\n    }\n\n    gl_FragColor = v_Color;\n  }\n\n  gl_FragColor.a *= opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n"; // extrude
+var polygonExtrudeFrag = "uniform float u_opacity: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n#pragma include \"picking\"\n\nvoid main() {\n  float opacity = styleMappingMat[0][0];  \n  float isSide = styleMappingMat[0][3];\n  float sidey = styleMappingMat[3][0];\n  float lightWeight = styleMappingMat[3][1];\n\n  // Tip: \u90E8\u5206\u673A\u578B GPU \u8BA1\u7B97\u7CBE\u5EA6\u517C\u5BB9\n  if(isSide < 0.999) {\n    // side face\n    if(u_sidesurface < 1.0) {\n      discard;\n    }\n\n    if(u_linearColor == 1.0) {\n      vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);\n      linearColor.rgb *= lightWeight;\n      gl_FragColor = linearColor;\n    } else {\n      gl_FragColor = v_Color;\n    }\n\n  } else {\n     // top face\n    if(u_topsurface < 1.0) {\n      discard;\n    }\n\n    gl_FragColor = v_Color;\n  }\n\n  gl_FragColor.a *= opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 
 /* babel-plugin-inline-import '../shaders/extrude/polygon_extrude_vert.glsl' */
-var polygonExtrudeVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec3 a_uvs;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_Color;\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_raisingHeight: 0.0;\nuniform float u_opacity: 1.0;\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - isSide\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0  // sidey\n  );\n  styleMappingMat[0][3] = a_Position.z;\n  styleMappingMat[3][0] = a_uvs[2];\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  vec4 project_pos = project_position(pos);\n\n  if(u_heightfixed > 0.0) { // \u5224\u65AD\u51E0\u4F55\u4F53\u662F\u5426\u56FA\u5B9A\u9AD8\u5EA6\n    project_pos.z = a_Position.z * a_Size;\n    project_pos.z += u_raisingHeight;\n\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      project_pos.z *= mapboxZoomScale;\n      project_pos.z += u_raisingHeight * mapboxZoomScale;\n    }\n  }\n\n  // project_pos.z += 500000.0; // amap1\n\n  // project_pos.z += (500000.0 * 4.0)/pow(2.0, 21.0 - u_Zoom); // mapbox\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  float lightWeight = calc_lighting(pos);\n  // v_Color = a_Color;\n  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  styleMappingMat[3][1] = lightWeight;\n\n  setPickingColor(a_PickingColor);\n}\n";
+var polygonExtrudeVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec3 a_uvs;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_Color;\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_raisingHeight: 0.0;\nuniform float u_opacity: 1.0;\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - isSide\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0  // sidey\n  );\n  styleMappingMat[0][3] = a_Position.z;\n  styleMappingMat[3][0] = a_uvs[2];\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  vec4 project_pos = project_position(pos);\n\n  if(u_heightfixed > 0.0) { // \u5224\u65AD\u51E0\u4F55\u4F53\u662F\u5426\u56FA\u5B9A\u9AD8\u5EA6\n    project_pos.z = a_Position.z * a_Size;\n    project_pos.z += u_raisingHeight;\n\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      project_pos.z *= mapboxZoomScale;\n      project_pos.z += u_raisingHeight * mapboxZoomScale;\n    }\n  }\n\n  // project_pos.z += 500000.0; // amap1\n\n  // project_pos.z += (500000.0 * 4.0)/pow(2.0, 21.0 - u_Zoom); // mapbox\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  float lightWeight = calc_lighting(pos);\n  // v_Color = a_Color;\n  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  styleMappingMat[3][1] = lightWeight;\n\n  setPickingColor(a_PickingColor);\n}\n"; // extrude
 
 /* babel-plugin-inline-import '../shaders/extrude/polygon_extrudetex_frag.glsl' */
 var polygonExtrudeTexFrag = "uniform sampler2D u_texture;\nuniform float u_opacity: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n#pragma include \"picking\"\n\nvoid main() {\n  float opacity = styleMappingMat[0][0];\n  float isSide = styleMappingMat[0][3];\n  float lightWeight = styleMappingMat[3][1];\n  float topU = styleMappingMat[2][2];\n  float topV = styleMappingMat[2][3];\n\n  float sidey = styleMappingMat[3][0];\n  // Tip: \u90E8\u5206\u673A\u578B GPU \u8BA1\u7B97\u7CBE\u5EA6\u517C\u5BB9\n  if(isSide < 0.999) {\n    // side face\n    if(u_sidesurface < 1.0) {\n      discard;\n    }\n\n    if(u_linearColor == 1.0) {\n      vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);\n      linearColor.rgb *= lightWeight;\n      gl_FragColor = linearColor;\n    } else {\n      gl_FragColor = v_Color;\n    }\n  } else {\n\n     // top face\n    if(u_topsurface < 1.0) {\n      discard;\n    }\n\n    gl_FragColor = texture2D(u_texture, vec2(topU, topV));\n  }\n  \n\n  gl_FragColor.a *= opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n"; // texture
@@ -133,13 +133,9 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
             switch (_context.prev = _context.next) {
               case 0:
                 this.loadTexture();
-                _context.next = 3;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 3:
-                return _context.abrupt("return", _context.sent);
-
-              case 4:
+              case 2:
               case "end":
                 return _context.stop();
             }

package/es/polygon/models/fill.js

@@ -103,13 +103,9 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/es/polygon/models/ocean.js

@@ -71,13 +71,9 @@ var OceanModel = /*#__PURE__*/function (_BaseModel) {
             switch (_context.prev = _context.next) {
               case 0:
                 this.loadTexture();
-                _context.next = 3;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 3:
-                return _context.abrupt("return", _context.sent);
-
-              case 4:
+              case 2:
               case "end":
                 return _context.stop();
             }

package/es/polygon/models/water.js

@@ -66,13 +66,9 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
             switch (_context.prev = _context.next) {
               case 0:
                 this.loadTexture();
-                _context.next = 3;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 3:
-                return _context.abrupt("return", _context.sent);
-
-              case 4:
+              case 2:
               case "end":
                 return _context.stop();
             }

package/es/raster/models/raster.js

@@ -11,7 +11,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { getMask, getDefaultDomain } from '@antv/l7-utils';
+import { getDefaultDomain, getMask } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
@@ -178,13 +178,9 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                _context3.next = 2;
-                return this.initModels();
+                return _context3.abrupt("return", this.initModels());
 
-              case 2:
-                return _context3.abrupt("return", _context3.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context3.stop();
             }

package/es/raster/models/rasterRgb.js

@@ -21,12 +21,12 @@ import { getMask } from '@antv/l7-utils';
 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 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";
 
+/* babel-plugin-inline-import '../shaders/raster_rgb_frag.glsl' */
+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}";
+
 var RasterModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(RasterModel, _BaseModel);
 
@@ -198,13 +198,9 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                _context3.next = 2;
-                return this.initModels();
-
-              case 2:
-                return _context3.abrupt("return", _context3.sent);
+                return _context3.abrupt("return", this.initModels());
 
-              case 3:
+              case 1:
               case "end":
                 return _context3.stop();
             }