@antv/l7-layers 2.12.1 → 2.13.0

package/es/polygon/models/index.js

@@ -7,7 +7,6 @@ import TextModel from "../../point/models/text";
 import ExtrudeModel from "./extrude";
 import FillModel from "./fill";
 import Ocean from "./ocean";
-import TilePolygonModel from "./tile";
 import Water from "./water";
 var PolygonModels = {
   fill: FillModel,
@@ -19,8 +18,7 @@ var PolygonModels = {
   point_normal: NormalModel,
   point_extrude: PointExtrudeModel,
   water: Water,
-  ocean: Ocean,
-  // point_fill: PointModels.fill,
-  tile: TilePolygonModel
+  ocean: Ocean // point_fill: PointModels.fill,
+
 };
 export default PolygonModels;

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

@@ -3,7 +3,6 @@ import BaseModel from '../../core/BaseModel';
 export default class RasterModel extends BaseModel {
     protected texture: ITexture2D;
     protected colorTexture: ITexture2D;
-    private rampColors;
     getUninforms(): {
         u_opacity: number;
         u_texture: ITexture2D;
@@ -18,5 +17,4 @@ export default class RasterModel extends BaseModel {
     buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
-    private updateColorTexture;
 }

package/es/raster/models/raster.js

@@ -11,12 +11,12 @@ 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 { generateColorRamp, getMask } from '@antv/l7-utils';
+import { getMask, getDefaultDomain } from '@antv/l7-utils';
 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;\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";
+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   \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";
@@ -44,15 +44,15 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
           clampHigh = _ref$clampHigh === void 0 ? true : _ref$clampHigh,
           _ref$noDataValue = _ref.noDataValue,
           noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
-          _ref$domain = _ref.domain,
-          domain = _ref$domain === void 0 ? [0, 1] : _ref$domain,
+          domain = _ref.domain,
           rampColors = _ref.rampColors;
 
-      this.colorTexture = this.layer.textureService.getColorTexture(rampColors);
+      var newdomain = domain || getDefaultDomain(rampColors);
+      this.colorTexture = this.layer.textureService.getColorTexture(rampColors, newdomain);
       return {
         u_opacity: opacity || 1,
         u_texture: this.texture,
-        u_domain: domain,
+        u_domain: newdomain,
         u_clampLow: clampLow,
         u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
         u_noDataValue: noDataValue,
@@ -228,22 +228,6 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
         }
       });
     }
-  }, {
-    key: "updateColorTexture",
-    value: function updateColorTexture() {
-      var createTexture2D = this.rendererService.createTexture2D;
-
-      var _ref3 = this.layer.getLayerConfig(),
-          rampColors = _ref3.rampColors;
-
-      var imageData = generateColorRamp(rampColors);
-      this.colorTexture = createTexture2D({
-        data: imageData.data,
-        width: imageData.width,
-        height: imageData.height,
-        flipY: false
-      });
-    }
   }]);
 
   return RasterModel;

package/es/raster/models/rasterTerrainRgb.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 } from '@antv/l7-utils';
+import { getMask, getDefaultDomain } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 
@@ -43,23 +43,23 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
           clampHigh = _ref$clampHigh === void 0 ? true : _ref$clampHigh,
           _ref$noDataValue = _ref.noDataValue,
           noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
-          _ref$domain = _ref.domain,
-          domain = _ref$domain === void 0 ? [0, 1] : _ref$domain,
+          domain = _ref.domain,
           rampColors = _ref.rampColors,
           colorTexture = _ref.colorTexture;
 
+      var newdomain = domain || getDefaultDomain(rampColors);
       var texture = colorTexture;
 
       if (!colorTexture) {
-        texture = this.layer.textureService.getColorTexture(rampColors);
+        texture = this.layer.textureService.getColorTexture(rampColors, newdomain);
       } else {
-        this.layer.textureService.setColorTexture(colorTexture, rampColors);
+        this.layer.textureService.setColorTexture(colorTexture, rampColors, newdomain);
       }
 
       return {
         u_opacity: opacity || 1,
         u_texture: this.texture,
-        u_domain: domain,
+        u_domain: newdomain,
         u_clampLow: clampLow,
         u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
         u_noDataValue: noDataValue,

package/es/raster/shaders/raster_2d_frag.glsl

@@ -20,6 +20,7 @@ void main() {
   else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))
     gl_FragColor = vec4(0, 0, 0, 0);
   else {
+   
     float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);
     vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));
     gl_FragColor = color;

package/es/tile/tileFactory/RasterRGBTile.js

@@ -13,7 +13,6 @@ 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 RasterLayer from './layers/RasterDataLayer';
 import RasterLayer from "../../raster";
 import Tile from "./Tile";
 

package/es/tile/tileFactory/RasterTile.js

@@ -15,6 +15,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import RasterLayer from "../../raster";
 import Tile from "./Tile";
+import { getDefaultDomain } from '@antv/l7-utils';
 var DEFAULT_COLOR_TEXTURE_OPTION = {
   positions: [0, 1],
   colors: ['#000', '#fff']
@@ -35,7 +36,8 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
     key: "initTileLayer",
     value: function () {
       var _initTileLayer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var attributes, layerOptions, sourceOptions, layer;
+        var attributes, layerOptions, sourceOptions, _ref, rampColors, domain, layer;
+
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -43,7 +45,8 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
                 attributes = this.parent.getLayerAttributeConfig();
                 layerOptions = this.getLayerOptions();
                 sourceOptions = this.getSourceOption();
-                this.colorTexture = this.parent.textureService.getColorTexture(layerOptions.rampColors);
+                _ref = this.getLayerOptions(), rampColors = _ref.rampColors, domain = _ref.domain;
+                this.colorTexture = this.parent.textureService.getColorTexture(rampColors, domain);
                 layer = new RasterLayer(_objectSpread(_objectSpread({}, layerOptions), {}, {
                   colorTexture: this.colorTexture
                 })).source(sourceOptions.data, sourceOptions.options); // 初始化数据映射
@@ -55,13 +58,13 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
 
                   layer[attr]((_attributes$attr = attributes[attr]) === null || _attributes$attr === void 0 ? void 0 : _attributes$attr.field, (_attributes$attr2 = attributes[attr]) === null || _attributes$attr2 === void 0 ? void 0 : _attributes$attr2.values);
                 });
-                _context.next = 8;
+                _context.next = 9;
                 return this.addLayer(layer);
 
-              case 8:
+              case 9:
                 this.isLoaded = true;
 
-              case 9:
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -109,9 +112,11 @@ var RasterTile = /*#__PURE__*/function (_Tile) {
         arg[_key] = arguments[_key];
       }
 
-      var _arg$rampColors = arg.rampColors,
-          rampColors = _arg$rampColors === void 0 ? DEFAULT_COLOR_TEXTURE_OPTION : _arg$rampColors;
-      this.colorTexture = this.parent.textureService.getColorTexture(rampColors);
+      var _ref2 = arg,
+          _ref2$rampColors = _ref2.rampColors,
+          rampColors = _ref2$rampColors === void 0 ? DEFAULT_COLOR_TEXTURE_OPTION : _ref2$rampColors,
+          domain = _ref2.domain;
+      this.colorTexture = this.parent.textureService.getColorTexture(rampColors, domain || getDefaultDomain(rampColors));
       this.layers.forEach(function (layer) {
         return layer.style({
           colorTexture: _this.colorTexture

package/lib/core/BaseLayer.js

@@ -471,8 +471,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "filter",
     value: function filter(field, values, updateOptions) {
-      this.updateStyleAttribute('filter', field, values, updateOptions);
-      this.dataState.dataSourceNeedUpdate = true;
+      var flag = this.updateStyleAttribute('filter', field, values, updateOptions);
+      this.dataState.dataSourceNeedUpdate = flag;
       return this;
     }
   }, {
@@ -482,9 +482,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         field: field,
         values: values
       };
-      this.updateStyleAttribute('shape', field, values, updateOptions);
-      this.dataState.dataSourceNeedUpdate = true; // 通过数据更新驱动shape 更新
-
+      var flag = this.updateStyleAttribute('shape', field, values, updateOptions);
+      this.dataState.dataSourceNeedUpdate = flag;
       return this;
     }
   }, {
@@ -1439,7 +1438,17 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   }, {
     key: "updateStyleAttribute",
     value: function updateStyleAttribute(type, field, values, updateOptions) {
-      // 存储 Attribute
+      // encode diff
+      var preAttribute = this.configService.getAttributeConfig(this.id) || {}; // @ts-ignore
+
+      if ((0, _lodash.isEqual)(preAttribute[type], {
+        field: field,
+        values: values
+      })) {
+        return false;
+      } // 存储 Attribute
+
+
       if (['color', 'size', 'texture', 'rotate', 'filter', 'label', 'shape'].indexOf(type) !== -1) {
         this.configService.setAttributeConfig(this.id, (0, _defineProperty2.default)({}, type, {
           field: field,
@@ -1466,6 +1475,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         }, // @ts-ignore
         updateOptions);
       }
+
+      return true;
     }
   }, {
     key: "getLayerAttributeConfig",

package/lib/core/TextureService.js

@@ -25,14 +25,14 @@ var TextureService = /*#__PURE__*/function () {
 
   (0, _createClass2.default)(TextureService, [{
     key: "getColorTexture",
-    value: function getColorTexture(colorRamp) {
+    value: function getColorTexture(colorRamp, domain) {
       // TODO 支持传入图片
-      var currentkey = this.getTextureKey(colorRamp);
+      var currentkey = this.getTextureKey(colorRamp, domain);
 
       if (this.key === currentkey) {
         return this.colorTexture;
       } else {
-        this.createColorTexture(colorRamp);
+        this.createColorTexture(colorRamp, domain);
       }
 
       this.key = currentkey;
@@ -40,9 +40,9 @@ var TextureService = /*#__PURE__*/function () {
     }
   }, {
     key: "createColorTexture",
-    value: function createColorTexture(colorRamp) {
+    value: function createColorTexture(colorRamp, domain) {
       var createTexture2D = this.rendererService.createTexture2D;
-      var imageData = (0, _l7Utils.generateColorRamp)(colorRamp);
+      var imageData = this.getColorRampBar(colorRamp, domain);
       var texture = createTexture2D({
         data: imageData.data,
         width: imageData.width,
@@ -54,8 +54,8 @@ var TextureService = /*#__PURE__*/function () {
     }
   }, {
     key: "setColorTexture",
-    value: function setColorTexture(texture, colorRamp) {
-      this.key = this.getTextureKey(colorRamp);
+    value: function setColorTexture(texture, colorRamp, domain) {
+      this.key = this.getTextureKey(colorRamp, domain);
       this.colorTexture = texture;
     }
   }, {
@@ -65,10 +65,32 @@ var TextureService = /*#__PURE__*/function () {
 
       (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
     }
+  }, {
+    key: "getColorRampBar",
+    value: function getColorRampBar(colorRamp, domain) {
+      switch (colorRamp.type) {
+        case 'cat':
+          return (0, _l7Utils.generateCatRamp)(colorRamp);
+
+        case 'quantize':
+          return (0, _l7Utils.generateQuantizeRamp)(colorRamp);
+
+        case 'custom':
+          return (0, _l7Utils.generateCustomRamp)(colorRamp, domain);
+
+        case 'linear':
+          return (0, _l7Utils.generateLinearRamp)(colorRamp, domain);
+
+        default:
+          return (0, _l7Utils.generateColorRamp)(colorRamp);
+      }
+    }
   }, {
     key: "getTextureKey",
-    value: function getTextureKey(colorRamp) {
-      return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp.positions.join('_'));
+    value: function getTextureKey(colorRamp, domain) {
+      var _colorRamp$positions;
+
+      return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp === null || colorRamp === void 0 ? void 0 : (_colorRamp$positions = colorRamp.positions) === null || _colorRamp$positions === void 0 ? void 0 : _colorRamp$positions.join('_'), "_").concat(colorRamp.type, "_").concat(domain === null || domain === void 0 ? void 0 : domain.join('_'));
     }
   }]);
   return TextureService;

package/lib/core/interface.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.lineStyleType = exports.TextureBlend = exports.LinearDir = exports.CanvasUpdateType = void 0;
+exports.lineStyleType = exports.TextureBlend = exports.SizeUnitType = exports.LinearDir = exports.CanvasUpdateType = void 0;
 var lineStyleType;
 exports.lineStyleType = lineStyleType;
 
@@ -32,6 +32,14 @@ exports.TextureBlend = TextureBlend;
   TextureBlend["REPLACE"] = "replace";
 })(TextureBlend || (exports.TextureBlend = TextureBlend = {}));
 
+var SizeUnitType;
+exports.SizeUnitType = SizeUnitType;
+
+(function (SizeUnitType) {
+  SizeUnitType[SizeUnitType["pixel"] = 0] = "pixel";
+  SizeUnitType[SizeUnitType["meter"] = 1] = "meter";
+})(SizeUnitType || (exports.SizeUnitType = SizeUnitType = {}));
+
 var CanvasUpdateType;
 exports.CanvasUpdateType = CanvasUpdateType;
 

package/lib/line/models/index.js

@@ -23,8 +23,6 @@ var _linearline = _interopRequireDefault(require("./linearline"));
 
 var _simpleLine = _interopRequireDefault(require("./simpleLine"));
 
-var _tile = _interopRequireDefault(require("./tile"));
-
 var _wall = _interopRequireDefault(require("./wall"));
 
 var LineModels = {
@@ -36,7 +34,6 @@ var LineModels = {
   halfLine: _half.default,
   simple: _simpleLine.default,
   linearline: _linearline.default,
-  tileLine: _tile.default,
   earthArc3d: _earthArc_3d.default
 };
 var _default = LineModels;

package/lib/plugins/DataMappingPlugin.js

@@ -84,14 +84,11 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
                 case 2:
                   layer.dataState.dataMappingNeedUpdate = false;
-
-                  _this.generateMaping(layer, {
+                  return _context2.abrupt("return", _this.generateMaping(layer, {
                     styleAttributeService: styleAttributeService
-                  });
-
-                  return _context2.abrupt("return", true);
+                  }));
 
-                case 5:
+                case 4:
                 case "end":
                   return _context2.stop();
               }
@@ -163,9 +160,15 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
 
       filterData = layer.processData(filterData);
       var encodeData = this.mapping(layer, attributes, filterData, undefined);
-      layer.setEncodedData(encodeData); // 对外暴露事件
+      layer.setEncodedData(encodeData);
+
+      if (dataArray.length === 0 && layer.encodeDataLength === 0) {
+        return false;
+      } // 对外暴露事件
+
 
       layer.emit('dataUpdate', null);
+      return true;
     }
   }, {
     key: "mapping",

package/lib/point/models/fill.js

@@ -9,24 +9,18 @@ exports.default = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 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 _l7Core = require("@antv/l7-core");
 
 var _l7Utils = require("@antv/l7-utils");
@@ -35,7 +29,7 @@ var _lodash = require("lodash");
 
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 
-var _l7Maps = require("@antv/l7-maps");
+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); }; }
 
@@ -49,7 +43,7 @@ var waveFillFrag = "\nuniform float u_additive;\n\nvarying mat4 styleMappingMat;
 var pointFillFrag = "uniform float u_additive;\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  int shape = int(floor(v_data.w + 0.5));\n\n  vec4 textrueStroke = vec4(\n    styleMappingMat[1][0],\n    styleMappingMat[1][1],\n    styleMappingMat[1][2],\n    styleMappingMat[1][3]\n  );\n\n  float opacity = styleMappingMat[0][0];\n  float stroke_opacity = styleMappingMat[0][1];\n  float strokeWidth = styleMappingMat[0][2];\n  vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius + strokeWidth);\n\n  float outer_df;\n  float inner_df;\n  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n  if (shape == 0) {\n    outer_df = sdCircle(v_data.xy, 1.0);\n    inner_df = sdCircle(v_data.xy, r);\n  } else if (shape == 1) {\n    outer_df = sdEquilateralTriangle(1.1 * v_data.xy);\n    inner_df = sdEquilateralTriangle(1.1 / r * v_data.xy);\n  } else if (shape == 2) {\n    outer_df = sdBox(v_data.xy, vec2(1.));\n    inner_df = sdBox(v_data.xy, vec2(r));\n  } else if (shape == 3) {\n    outer_df = sdPentagon(v_data.xy, 0.8);\n    inner_df = sdPentagon(v_data.xy, r * 0.8);\n  } else if (shape == 4) {\n    outer_df = sdHexagon(v_data.xy, 0.8);\n    inner_df = sdHexagon(v_data.xy, r * 0.8);\n  } else if (shape == 5) {\n    outer_df = sdOctogon(v_data.xy, 1.0);\n    inner_df = sdOctogon(v_data.xy, r);\n  } else if (shape == 6) {\n    outer_df = sdHexagram(v_data.xy, 0.52);\n    inner_df = sdHexagram(v_data.xy, r * 0.52);\n  } else if (shape == 7) {\n    outer_df = sdRhombus(v_data.xy, vec2(1.0));\n    inner_df = sdRhombus(v_data.xy, vec2(r));\n  } else if (shape == 8) {\n    outer_df = sdVesica(v_data.xy, 1.1, 0.8);\n    inner_df = sdVesica(v_data.xy, r * 1.1, r * 0.8);\n  }\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = strokeWidth < 0.01 ? 0.0 : smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n\n  if(strokeWidth < 0.01) {\n    gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);\n  } else {\n    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t);\n  }\n\n  if(u_additive > 0.0) {\n    gl_FragColor *= opacity_t;\n    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);\n  } else {\n    gl_FragColor.a *= opacity_t;\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
 
 /* babel-plugin-inline-import '../shaders/fill_vert.glsl' */
-var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\n\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\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_meter2coord;\nuniform float u_meteryScale;\nuniform float u_isMeter;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\nuniform vec2 u_offsets;\n\nuniform float u_blur : 0.0;\nuniform float u_raisingHeight: 0.0;\nuniform float u_heightfixed: 0.0;\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  /*\n  *  setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n  *  u_meter2coord \u5728\u7B49\u9762\u79EF\u5927\u5C0F\u7684\u65F6\u5019\u8BBE\u7F6E\u5355\u4F4D\n  */\n  float newSize = setPickingSize(a_Size) * u_meter2coord;\n  // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\n\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 - empty\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\n  );\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\n  vec2 strokeOpacityAndOffset = calStrokeOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][1] = strokeOpacityAndOffset.r;\n  textureOffset = strokeOpacityAndOffset.g;\n\n  vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][2] = strokeWidthAndOffset.r;\n  textureOffset = strokeWidthAndOffset.g;\n\n  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);\n  if(hasStroke()) {\n    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R\n    textureOffset += 1.0;\n\n    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G\n    textureOffset += 1.0;\n\n    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B\n    textureOffset += 1.0;\n\n    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A\n    textureOffset += 1.0;\n  } else {\n    if(u_stroke_color == vec4(0.0)) {\n      styleMappingMat[1][0] = v_color.r;\n      styleMappingMat[1][1] = v_color.g;\n      styleMappingMat[1][2] = v_color.b;\n      styleMappingMat[1][3] = v_color.a;\n    } else {\n      styleMappingMat[1][0] = u_stroke_color.r;\n      styleMappingMat[1][1] = u_stroke_color.g;\n      styleMappingMat[1][2] = u_stroke_color.b;\n      styleMappingMat[1][3] = u_stroke_color.a;\n    }\n  }\n\n  vec2 textrueOffsets = vec2(0.0, 0.0);\n  if(hasOffsets()) {\n    vec2 valueXPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.r = pos2value(valueXPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n\n    vec2 valueYPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.g = pos2value(valueYPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n  } else {\n    textrueOffsets = u_offsets;\n  }\n\n  // cal style mapping\n\n  // unpack color(vec2)\n  v_color = a_Color;\n\n  // radius(16-bit)\n  v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);\n\n  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + textrueOffsets);\n  vec3 aPosition = a_Position;\n  if(u_isMeter < 1.0) {\n    // \u4E0D\u4EE5\u7C73\u4E3A\u5B9E\u9645\u5355\u4F4D\n    offset = project_pixel(offset);\n  } else {\n    // \u4EE5\u7C73\u4E3A\u5B9E\u9645\u5355\u4F4D\n    if(newSize * pow(2.0, u_Zoom) < 48.0) {\n      antialiasblur = max(antialiasblur, -0.05);\n    } else if(newSize * pow(2.0, u_Zoom) < 128.0) {\n      antialiasblur = max(antialiasblur, -0.6/pow(u_Zoom, 2.0));\n    } else {\n      antialiasblur = max(antialiasblur, -0.8/pow(u_Zoom, 2.0));\n    }\n    \n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      aPosition.x += offset.x / u_meteryScale;\n      aPosition.y += offset.y;\n      offset = vec2(0.0);\n    }\n  }\n\n  // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n\n  // vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  float raisingHeight = u_raisingHeight;\n\n  if(u_heightfixed < 1.0) { // false\n    raisingHeight = project_pixel(u_raisingHeight);\n  } else {\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      raisingHeight = u_raisingHeight * mapboxZoomScale;\n    }\n  }\n \n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));\n  }\n \n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
+var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\n\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\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;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\nuniform vec2 u_offsets;\n\nuniform float u_blur : 0.0;\nuniform float u_raisingHeight: 0.0;\nuniform float u_heightfixed: 0.0;\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  /*\n  *  setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n  *  u_meter2coord \u5728\u7B49\u9762\u79EF\u5927\u5C0F\u7684\u65F6\u5019\u8BBE\u7F6E\u5355\u4F4D\n  */\n  float newSize = setPickingSize(a_Size);\n  // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\n\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 - empty\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\n  );\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\n  vec2 strokeOpacityAndOffset = calStrokeOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][1] = strokeOpacityAndOffset.r;\n  textureOffset = strokeOpacityAndOffset.g;\n\n  vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][2] = strokeWidthAndOffset.r;\n  textureOffset = strokeWidthAndOffset.g;\n\n  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);\n  if(hasStroke()) {\n    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R\n    textureOffset += 1.0;\n\n    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G\n    textureOffset += 1.0;\n\n    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B\n    textureOffset += 1.0;\n\n    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A\n    textureOffset += 1.0;\n  } else {\n    if(u_stroke_color == vec4(0.0)) {\n      styleMappingMat[1][0] = v_color.r;\n      styleMappingMat[1][1] = v_color.g;\n      styleMappingMat[1][2] = v_color.b;\n      styleMappingMat[1][3] = v_color.a;\n    } else {\n      styleMappingMat[1][0] = u_stroke_color.r;\n      styleMappingMat[1][1] = u_stroke_color.g;\n      styleMappingMat[1][2] = u_stroke_color.b;\n      styleMappingMat[1][3] = u_stroke_color.a;\n    }\n  }\n\n  vec2 textrueOffsets = vec2(0.0, 0.0);\n  if(hasOffsets()) {\n    vec2 valueXPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.r = pos2value(valueXPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n\n    vec2 valueYPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.g = pos2value(valueYPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n  } else {\n    textrueOffsets = u_offsets;\n  }\n\n  // cal style mapping\n\n  // unpack color(vec2)\n  v_color = a_Color;\nif(u_Size_Unit == 1) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n\n   v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);\n\n  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + textrueOffsets);\n  vec3 aPosition = a_Position;\n\n  offset = project_pixel(offset);\n  \n  // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n\n  // vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  float raisingHeight = u_raisingHeight;\n\n  if(u_heightfixed < 1.0) { // false\n    raisingHeight = project_pixel(u_raisingHeight);\n  } else {\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      raisingHeight = u_raisingHeight * mapboxZoomScale;\n    }\n  }\n \n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position =  u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));\n  }\n \n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
 
 var FillModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(FillModel, _BaseModel);
@@ -57,20 +51,8 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
   var _super = _createSuper(FillModel);
 
   function FillModel() {
-    var _this;
-
     (0, _classCallCheck2.default)(this, FillModel);
-
-    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), "meter2coord", 1);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "meterYScale", 1);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isMeter", false);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "unit", 'l7size');
-    return _this;
+    return _super.apply(this, arguments);
   }
 
   (0, _createClass2.default)(FillModel, [{
@@ -95,9 +77,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
           _ref$heightfixed = _ref.heightfixed,
           heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
           _ref$unit = _ref.unit,
-          unit = _ref$unit === void 0 ? 'l7size' : _ref$unit;
-
-      this.updateUnit(unit);
+          unit = _ref$unit === void 0 ? 'pixel' : _ref$unit;
 
       if (this.dataTextureTest && this.dataTextureNeedUpdate({
         opacity: opacity,
@@ -143,9 +123,6 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
       return {
         u_raisingHeight: Number(raisingHeight),
         u_heightfixed: Number(heightfixed),
-        u_meter2coord: this.meter2coord,
-        u_meteryScale: this.meterYScale,
-        u_isMeter: Number(this.isMeter),
         u_blur: blur,
         u_additive: blend === 'additive' ? 1.0 : 0.0,
         u_dataTexture: this.dataTexture,
@@ -155,6 +132,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
         u_stroke_opacity: (0, _lodash.isNumber)(strokeOpacity) ? strokeOpacity : 1.0,
         u_stroke_width: (0, _lodash.isNumber)(strokeWidth) ? strokeWidth : 1.0,
         u_stroke_color: this.getStrokeColor(stroke),
+        u_Size_Unit: _interface.SizeUnitType[unit],
         u_offsets: this.isOffsetStatic(offsets) ? offsets : [0, 0]
       };
     }
@@ -185,14 +163,13 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                this.updateUnit('l7size');
-                _context.next = 3;
+                _context.next = 2;
                 return this.buildModels();
 
-              case 3:
+              case 2:
                 return _context.abrupt("return", _context.sent);
 
-              case 4:
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -206,50 +183,6 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
 
       return initModels;
     }()
-    /**
-     * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
-     * @returns
-     */
-
-  }, {
-    key: "calMeter2Coord",
-    value: function calMeter2Coord() {
-      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];
-
-      var center = [(minLng + maxLng) / 2, (minLat + maxLat) / 2];
-      var version = this.mapService.version;
-      var mapboxContext = _l7Utils.$window === null || _l7Utils.$window === void 0 ? void 0 : _l7Utils.$window.mapboxgl;
-
-      if (version === _l7Maps.Version.MAPBOX && mapboxContext !== null && mapboxContext !== void 0 && mapboxContext.MercatorCoordinate) {
-        // 参考：
-        // https://docs.mapbox.com/mapbox-gl-js/api/geography/#mercatorcoordinate#meterinmercatorcoordinateunits
-        var coord = mapboxContext.MercatorCoordinate.fromLngLat({
-          lng: center[0],
-          lat: center[1]
-        }, 0);
-        var offsetInMercatorCoordinateUnits = coord.meterInMercatorCoordinateUnits();
-        var westCoord = new mapboxContext.MercatorCoordinate(coord.x - offsetInMercatorCoordinateUnits, coord.y, coord.z);
-        var westLnglat = westCoord.toLngLat();
-        var southCoord = new mapboxContext.MercatorCoordinate(coord.x, coord.y - offsetInMercatorCoordinateUnits, coord.z);
-        var southLnglat = southCoord.toLngLat();
-        this.meter2coord = center[0] - westLnglat.lng;
-        this.meterYScale = (southLnglat.lat - center[1]) / this.meter2coord;
-        return;
-      }
-
-      var m1 = this.mapService.meterToCoord(center, [minLng, minLat]);
-      var m2 = this.mapService.meterToCoord(center, [maxLng === minLng ? maxLng + 0.1 : maxLng, maxLat === minLat ? minLat + 0.1 : maxLat]);
-      this.meter2coord = (m1 + m2) / 2;
-
-      if (!this.meter2coord) {
-        // Tip: 兼容单个数据导致的 m1、m2 为 NaN
-        this.meter2coord = 7.70681090738883;
-      }
-    }
   }, {
     key: "buildModels",
     value: function () {
@@ -412,29 +345,6 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
         }
       });
     }
-    /**
-     * 判断是否更新点图层的计量单位
-     * @param unit
-     */
-
-  }, {
-    key: "updateUnit",
-    value: function updateUnit(unit) {
-      var version = this.mapService.version;
-
-      if (this.unit !== unit) {
-        // l7size => meter
-        if (this.unit !== 'meter' && unit === 'meter' && version !== _l7Maps.Version.DEFUALT && version !== _l7Maps.Version.GLOBEL) {
-          this.isMeter = true;
-          this.calMeter2Coord(); // meter => l7size
-        } else if (this.unit === 'meter' && unit !== 'meter') {
-          this.isMeter = false;
-          this.meter2coord = 1;
-        }
-
-        this.unit = unit;
-      }
-    }
   }]);
   return FillModel;
 }(_BaseModel2.default);