@antv/l7-layers 2.15.2 → 2.15.4

package/lib/canvas/models/canvas.js

@@ -1,93 +1,63 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
-
 var _interface = require("../../core/interface");
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
 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; } }
-
 var CanvaModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(CanvaModel, _BaseModel);
-
   var _super = _createSuper(CanvaModel);
-
   function CanvaModel() {
     var _this;
-
     (0, _classCallCheck2.default)(this, CanvaModel);
-
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateMode", _interface.CanvasUpdateType.ALWAYS);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderUpdate", function () {
       var _ref = _this.layer.getLayerConfig(),
-          _ref$zIndex = _ref.zIndex,
-          zIndex = _ref$zIndex === void 0 ? 10 : _ref$zIndex,
-          _ref$update = _ref.update,
-          update = _ref$update === void 0 ? _interface.CanvasUpdateType.ALWAYS : _ref$update,
-          _ref$animateOption = _ref.animateOption,
-          animateOption = _ref$animateOption === void 0 ? {
-        enable: false,
-        duration: 20
-      } : _ref$animateOption;
-
+        _ref$zIndex = _ref.zIndex,
+        zIndex = _ref$zIndex === void 0 ? 10 : _ref$zIndex,
+        _ref$update = _ref.update,
+        update = _ref$update === void 0 ? _interface.CanvasUpdateType.ALWAYS : _ref$update,
+        _ref$animateOption = _ref.animateOption,
+        animateOption = _ref$animateOption === void 0 ? {
+          enable: false,
+          duration: 20
+        } : _ref$animateOption;
       if (+_this.canvas.style.zIndex === zIndex) {
         _this.canvas.style.zIndex = zIndex + '';
       }
-
       if (_this.updateMode !== update) {
         _this.updateMode = update;
-
         _this.unBindListener();
-
         _this.bindListener();
       }
-
       if (_this.updateMode === _interface.CanvasUpdateType.ALWAYS && animateOption.enable) {
         _this.renderCanvas();
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "unBindListener", function () {
       _this.mapService.off('mapchange', _this.renderCanvas);
-
       _this.mapService.off('zoomstart', _this.clearCanvas);
-
       _this.mapService.off('zoomend', _this.renderCanvas);
-
       _this.mapService.off('movestart', _this.clearCanvas);
-
       _this.mapService.off('moveend', _this.renderCanvas);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "bindListener", function () {
@@ -95,46 +65,36 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
         _this.mapService.on('mapchange', _this.renderCanvas);
       } else {
         _this.mapService.on('zoomstart', _this.clearCanvas);
-
         _this.mapService.on('zoomend', _this.renderCanvas);
-
         _this.mapService.on('movestart', _this.clearCanvas);
-
         _this.mapService.on('moveend', _this.renderCanvas);
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "clearCanvas", function () {
       if (_this.ctx) {
         var _this$rendererService = _this.rendererService.getViewportSize(),
-            w = _this$rendererService.width,
-            h = _this$rendererService.height;
-
+          w = _this$rendererService.width,
+          h = _this$rendererService.height;
         _this.ctx.clearRect(0, 0, w, h);
       }
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderCanvas", function () {
       var _this$rendererService2 = _this.rendererService.getViewportSize(),
-          viewWidth = _this$rendererService2.width,
-          viewHeight = _this$rendererService2.height;
-
+        viewWidth = _this$rendererService2.width,
+        viewHeight = _this$rendererService2.height;
       if (_this.prevSize[0] !== viewWidth || _this.prevSize[1] !== viewHeight) {
         _this.prevSize = [viewWidth, viewHeight];
-
         var size = _this.mapService.getSize();
-
         var _size = (0, _slicedToArray2.default)(size, 2),
-            width = _size[0],
-            height = _size[1];
-
+          width = _size[0],
+          height = _size[1];
         _this.canvas.width = viewWidth;
         _this.canvas.height = viewHeight;
         _this.canvas.style.width = width + 'px';
         _this.canvas.style.height = height + 'px';
       }
-
       var _ref2 = _this.layer.getLayerConfig(),
-          drawingOnCanvas = _ref2.drawingOnCanvas;
-
+        drawingOnCanvas = _ref2.drawingOnCanvas;
       if (_this.ctx) {
         drawingOnCanvas({
           canvas: _this.canvas,
@@ -146,18 +106,15 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     });
     return _this;
   }
-
   (0, _createClass2.default)(CanvaModel, [{
     key: "clearModels",
     value: function clearModels() {
       if (this.canvas) {
         var _this$mapService$getC;
-
-        (_this$mapService$getC = this.mapService.getContainer()) === null || _this$mapService$getC === void 0 ? void 0 : _this$mapService$getC.removeChild(this.canvas); // @ts-ignore
-
+        (_this$mapService$getC = this.mapService.getContainer()) === null || _this$mapService$getC === void 0 ? void 0 : _this$mapService$getC.removeChild(this.canvas);
+        // @ts-ignore
         this.canvas = null;
       }
-
       this.unBindListener();
     }
   }, {
@@ -165,51 +122,40 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _ref3, _ref3$update, update;
-
         return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _ref3 = this.layer.getLayerConfig(), _ref3$update = _ref3.update, update = _ref3$update === void 0 ? _interface.CanvasUpdateType.ALWAYS : _ref3$update;
-                this.updateMode = update;
-                this.initCanvas();
-                this.renderCanvas();
-                this.bindListener();
-                this.mapService.getContainer();
-                return _context.abrupt("return", []);
-
-              case 7:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _ref3 = this.layer.getLayerConfig(), _ref3$update = _ref3.update, update = _ref3$update === void 0 ? _interface.CanvasUpdateType.ALWAYS : _ref3$update;
+              this.updateMode = update;
+              this.initCanvas();
+              this.renderCanvas();
+              this.bindListener();
+              this.mapService.getContainer();
+              return _context.abrupt("return", []);
+            case 7:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function initModels() {
         return _initModels.apply(this, arguments);
       }
-
       return initModels;
     }()
   }, {
     key: "initCanvas",
     value: function initCanvas() {
       var _this$mapService$getC2;
-
       var _ref4 = this.layer.getLayerConfig(),
-          zIndex = _ref4.zIndex;
-
+        zIndex = _ref4.zIndex;
       var size = this.mapService.getSize();
-
       var _size2 = (0, _slicedToArray2.default)(size, 2),
-          width = _size2[0],
-          height = _size2[1];
-
+        width = _size2[0],
+        height = _size2[1];
       var _this$rendererService3 = this.rendererService.getViewportSize(),
-          viewWidth = _this$rendererService3.width,
-          viewHeight = _this$rendererService3.height;
-
+        viewWidth = _this$rendererService3.width,
+        viewHeight = _this$rendererService3.height;
       this.prevSize = [viewWidth, viewHeight];
       var canvas = document.createElement('canvas');
       this.canvas = canvas;
@@ -231,23 +177,18 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                return _context2.abrupt("return", this.initModels());
-
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", this.initModels());
+            case 1:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -258,5 +199,4 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
   }]);
   return CanvaModel;
 }(_BaseModel2.default);
-
 exports.default = CanvaModel;

package/lib/canvas/models/index.js

@@ -1,14 +1,11 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _canvas = _interopRequireDefault(require("./canvas"));
-
 var CanvasModels = {
   canvas: _canvas.default
 };

package/lib/citybuliding/building.js

@@ -1,81 +1,55 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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"));
-
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
-
 var _build = _interopRequireDefault(require("./models/build"));
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
 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; } }
-
 var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(CityBuildingLayer, _BaseLayer);
-
   var _super = _createSuper(CityBuildingLayer);
-
   function CityBuildingLayer() {
     var _this;
-
     (0, _classCallCheck2.default)(this, CityBuildingLayer);
-
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'CityBuildingLayer');
     return _this;
   }
-
   (0, _createClass2.default)(CityBuildingLayer, [{
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                this.layerModel = new _build.default(this);
-                _context.next = 3;
-                return this.initLayerModels();
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              this.layerModel = new _build.default(this);
+              _context.next = 3;
+              return this.initLayerModels();
+            case 3:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -93,5 +67,4 @@ var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
   }]);
   return CityBuildingLayer;
 }(_BaseLayer2.default);
-
 exports.default = CityBuildingLayer;

package/lib/citybuliding/models/build.js

@@ -1,79 +1,57 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _l7Core = require("@antv/l7-core");
-
 var _l7Utils = require("@antv/l7-utils");
-
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
-
 var _triangulation = require("../../core/triangulation");
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
 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; } }
-
 /* babel-plugin-inline-import '../shaders/build_frag.glsl' */
 var buildFrag = "uniform float u_opacity: 1.0;\nuniform vec4 u_baseColor : [ 1.0, 0, 0, 1.0 ];\nuniform vec4 u_brightColor : [ 1.0, 0, 0, 1.0 ];\nuniform vec4 u_windowColor : [ 1.0, 0, 0, 1.0 ];\nuniform float u_near : 0;\nuniform float u_far : 1;\nvarying vec4 v_Color;\nvarying vec2 v_texCoord;\nuniform float u_Zoom : 1;\nuniform float u_time;\n\nuniform float u_circleSweep;\nuniform float u_cityMinSize;\nuniform vec3 u_circleSweepColor;\nuniform float u_circleSweepSpeed;\n\nvarying float v_worldDis;\n\n#pragma include \"picking\"\n\nvec3 getWindowColor(float n, float hot, vec3 brightColor, vec3 darkColor) {\n    float s = step(hot, n);\n    vec3 color = mix(brightColor,vec3(0.9,0.9,1.0),n);\n\n    return mix(darkColor, color, s);\n}\nfloat random (vec2 st) {\n    return fract(sin(dot(st.xy, vec2(12.9898,78.233)))* 43758.5453123);\n}\n\nfloat LinearizeDepth()\n{\n    float z = gl_FragCoord.z * 2.0 - 1.0;\n    return (2.0 * u_near * u_far) / (u_far + u_near - z * (u_far - u_near));\n}\n\nvec3 fog(vec3 color, vec3 fogColor, float depth){\n    float fogFactor=clamp(depth,0.0,1.0);\n    vec3 output_color=mix(fogColor,color,fogFactor);\n    return output_color;\n}\n\nfloat sdRect(vec2 p, vec2 sz) {\n  vec2 d = abs(p) - sz;\n  float outside = length(max(d, 0.));\n  float inside = min(max(d.x, d.y), 0.);\n  return outside + inside;\n}\n\nvoid main() {\n  gl_FragColor = v_Color;\n  vec3 baseColor = u_baseColor.xyz;\n  vec3 brightColor = u_brightColor.xyz;\n  vec3 windowColor = u_windowColor.xyz;\n  float targetColId = 5.;\n  float depth = 1.0 - LinearizeDepth() / u_far * u_Zoom;\n  vec3 fogColor = vec3(23.0/255.0,31.0/255.0,51.0/255.0);\n  if(v_texCoord.x < 0.) { //\u9876\u90E8\u989C\u8272\n       vec3 foggedColor = fog(baseColor.xyz + vec3(0.12*0.9,0.2*0.9,0.3*0.9),fogColor,depth);\n       gl_FragColor = vec4( foggedColor, v_Color.w);\n  }else { // \u4FA7\u9762\u989C\u8272\n        vec2 st = v_texCoord;\n        vec2  UvScale = v_texCoord;\n        float tStep = min(0.08,max(0.05* (18.0-u_Zoom),0.02));\n        float tStart = 0.25 * tStep;\n        float tEnd = 0.75 * tStep;\n        float u = mod(UvScale.x, tStep);\n        float v = mod(UvScale.y, tStep);\n        float ux = floor(UvScale.x/tStep);\n        float uy = floor(UvScale.y/tStep);\n        float n = random(vec2(ux,uy));\n        float lightP = u_time;\n        float head = 1.0- step(0.005,st.y);\n        /*step3*/\n        // \u5C06\u7A97\u6237\u989C\u8272\u548C\u5899\u9762\u989C\u8272\u533A\u522B\u5F00\u6765\n        float sU = step(tStart, u) - step(tEnd, u);\n        float sV = step(tStart, v) - step(tEnd, v);\n        vec2 windowSize = vec2(abs(tEnd-tStart),abs(tEnd-tStart));\n        float dist = sdRect(vec2(u,v), windowSize);\n        float s = sU * sV;\n\n        float curColId = floor(UvScale.x / tStep);\n        float sCol = step(targetColId - 0.2, curColId) - step(targetColId + 0.2, curColId);\n\n        float mLightP = mod(lightP, 2.);\n        float sRow = step(mLightP - 0.2, st.y) - step(mLightP, st.y);\n        if(ux == targetColId){\n            n =0.;\n        }\n        float timeP = min(0.75, abs ( sin(u_time/3.0) ) );\n        float hot = smoothstep(1.0,0.0,timeP);\n        vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), s);\n        //vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), 1.0);\n        float sFinal = s * sCol * sRow;\n        color += mix(baseColor, brightColor, sFinal*n);\n        if (st.y<0.01){\n        color = baseColor;\n         }\n        if(head ==1.0) { // \u9876\u90E8\u4EAE\u7EBF\n            color = brightColor;\n        }\n        color = color * v_Color.rgb;\n\n        vec3 foggedColor = fog(color,fogColor,depth);\n\n        gl_FragColor = vec4(foggedColor,1.0);\n  }\n\n\n  if(u_circleSweep > 0.0 && v_worldDis < u_cityMinSize) {\n    float r = fract(((v_worldDis/u_cityMinSize) - u_time * u_circleSweepSpeed) * 2.0);\n    gl_FragColor.rgb += r * r * u_circleSweepColor;\n  }\n   \n  gl_FragColor.a *= u_opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
-
 /* babel-plugin-inline-import '../shaders/build_vert.glsl' */
 var buildVert = "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;\nuniform mat4 u_ModelMatrix;\n\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n\nvarying vec4 v_Color;\nuniform mat4 u_Mvp;\n\nuniform float u_circleSweep;\nuniform vec2 u_cityCenter;\n\nvarying float v_worldDis;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  vec4 project_pos = project_position(pos);\n\n   v_texCoord = a_Uv;\n\n  if(u_circleSweep > 0.0) {\n     vec2 lnglatscale = vec2(0.0);\n    if(u_CoordinateSystem != COORDINATE_SYSTEM_P20_2) {\n      lnglatscale = (a_Position.xy - u_cityCenter) * vec2(0.0, 0.135);\n    }\n    v_worldDis = length(a_Position.xy + lnglatscale - u_cityCenter);\n  }\n \n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\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  setPickingColor(a_PickingColor);\n}\n";
-
 var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(CityBuildModel, _BaseModel);
-
   var _super = _createSuper(CityBuildModel);
-
   function CityBuildModel() {
     (0, _classCallCheck2.default)(this, CityBuildModel);
     return _super.apply(this, arguments);
   }
-
   (0, _createClass2.default)(CityBuildModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-          _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-          _ref$baseColor = _ref.baseColor,
-          baseColor = _ref$baseColor === void 0 ? 'rgb(16,16,16)' : _ref$baseColor,
-          _ref$brightColor = _ref.brightColor,
-          brightColor = _ref$brightColor === void 0 ? 'rgb(255,176,38)' : _ref$brightColor,
-          _ref$windowColor = _ref.windowColor,
-          windowColor = _ref$windowColor === void 0 ? 'rgb(30,60,89)' : _ref$windowColor,
-          _ref$time = _ref.time,
-          time = _ref$time === void 0 ? 0 : _ref$time,
-          _ref$sweep = _ref.sweep,
-          sweep = _ref$sweep === void 0 ? {
-        enable: false,
-        sweepRadius: 1,
-        sweepColor: 'rgb(255, 255, 255)',
-        sweepSpeed: 0.4,
-        sweepCenter: this.cityCenter
-      } : _ref$sweep;
-
+        _ref$opacity = _ref.opacity,
+        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+        _ref$baseColor = _ref.baseColor,
+        baseColor = _ref$baseColor === void 0 ? 'rgb(16,16,16)' : _ref$baseColor,
+        _ref$brightColor = _ref.brightColor,
+        brightColor = _ref$brightColor === void 0 ? 'rgb(255,176,38)' : _ref$brightColor,
+        _ref$windowColor = _ref.windowColor,
+        windowColor = _ref$windowColor === void 0 ? 'rgb(30,60,89)' : _ref$windowColor,
+        _ref$time = _ref.time,
+        time = _ref$time === void 0 ? 0 : _ref$time,
+        _ref$sweep = _ref.sweep,
+        sweep = _ref$sweep === void 0 ? {
+          enable: false,
+          sweepRadius: 1,
+          sweepColor: 'rgb(255, 255, 255)',
+          sweepSpeed: 0.4,
+          sweepCenter: this.cityCenter
+        } : _ref$sweep;
       return {
         u_cityCenter: sweep.sweepCenter || this.cityCenter,
         u_cityMinSize: this.cityMinSize * sweep.sweepRadius,
@@ -92,17 +70,16 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
     value: function calCityGeo() {
       // @ts-ignore
       var _this$layer$getSource = (0, _slicedToArray2.default)(this.layer.getSource().extent, 4),
-          minLng = _this$layer$getSource[0],
-          minLat = _this$layer$getSource[1],
-          maxLng = _this$layer$getSource[2],
-          maxLat = _this$layer$getSource[3];
-
+        minLng = _this$layer$getSource[0],
+        minLat = _this$layer$getSource[1],
+        maxLng = _this$layer$getSource[2],
+        maxLat = _this$layer$getSource[3];
       if (this.mapService.version === 'GAODE2.x') {
         // @ts-ignore
-        this.cityCenter = this.mapService.lngLatToCoord([(maxLng + minLng) / 2, (maxLat + minLat) / 2]); // @ts-ignore
-
-        var l1 = this.mapService.lngLatToCoord([maxLng, maxLat]); // @ts-ignore
-
+        this.cityCenter = this.mapService.lngLatToCoord([(maxLng + minLng) / 2, (maxLat + minLat) / 2]);
+        // @ts-ignore
+        var l1 = this.mapService.lngLatToCoord([maxLng, maxLat]);
+        // @ts-ignore
         var l2 = this.mapService.lngLatToCoord([minLng, minLat]);
         this.cityMinSize = Math.sqrt(Math.pow(l1[0] - l2[0], 2) + Math.pow(l1[1] - l2[1], 2)) / 4;
       } else {
@@ -117,25 +94,20 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                this.calCityGeo();
-                this.startModelAnimate();
-                return _context.abrupt("return", this.buildModels());
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              this.calCityGeo();
+              this.startModelAnimate();
+              return _context.abrupt("return", this.buildModels());
+            case 3:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function initModels() {
         return _initModels.apply(this, arguments);
       }
-
       return initModels;
     }()
   }, {
@@ -144,40 +116,34 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return this.layer.buildLayerModel({
-                  moduleName: 'cityBuilding',
-                  vertexShader: buildVert,
-                  fragmentShader: buildFrag,
-                  triangulation: _triangulation.PolygonExtrudeTriangulation,
-                  depth: {
-                    enable: true
-                  },
-                  cull: {
-                    enable: true,
-                    face: _l7Core.gl.BACK
-                  }
-                });
-
-              case 2:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 4:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return this.layer.buildLayerModel({
+                moduleName: 'cityBuilding',
+                vertexShader: buildVert,
+                fragmentShader: buildFrag,
+                triangulation: _triangulation.PolygonExtrudeTriangulation,
+                depth: {
+                  enable: true
+                },
+                cull: {
+                  enable: true,
+                  face: _l7Core.gl.BACK
+                }
+              });
+            case 2:
+              model = _context2.sent;
+              return _context2.abrupt("return", [model]);
+            case 4:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -215,7 +181,7 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
           size: 1,
           update: function update(feature) {
             var _feature$size = feature.size,
-                size = _feature$size === void 0 ? 10 : _feature$size;
+              size = _feature$size === void 0 ? 10 : _feature$size;
             return Array.isArray(size) ? [size[0]] : [size];
           }
         }
@@ -241,5 +207,4 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
   }]);
   return CityBuildModel;
 }(_BaseModel2.default);
-
 exports.default = CityBuildModel;