@antv/l7-layers 2.12.2 → 2.13.0

package/es/core/BaseLayer.d.ts

@@ -208,7 +208,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     rebuildModels(): Promise<void>;
     renderMulPass(multiPassRenderer: IMultiPassRenderer): Promise<void>;
     renderModels(isPicking?: boolean): this;
-    updateStyleAttribute(type: string, field: StyleAttributeField, values?: StyleAttributeOption, updateOptions?: Partial<IStyleAttributeUpdateOptions>): void;
+    updateStyleAttribute(type: string, field: StyleAttributeField, values?: StyleAttributeOption, updateOptions?: Partial<IStyleAttributeUpdateOptions>): boolean;
     getLayerAttributeConfig(): Partial<ILayerAttributesOption>;
     getShaderPickStat(): boolean;
     /**

package/es/core/BaseLayer.js

@@ -34,7 +34,7 @@ import { BlendType, lazyInject, TYPES } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { encodePickingColor, WorkerSourceMap } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
-import { isFunction, isObject, isUndefined } from 'lodash';
+import { isEqual, isFunction, isObject, isUndefined } from 'lodash';
 import { BlendTypes } from "../utils/blend";
 import { styleDataMapping } from "../utils/dataMappingStyle";
 import { calculateData } from "../utils/layerData";
@@ -469,8 +469,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     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;
     }
   }, {
@@ -480,9 +480,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         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;
     }
   }, {
@@ -1438,7 +1437,17 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
   }, {
     key: "updateStyleAttribute",
     value: function updateStyleAttribute(type, field, values, updateOptions) {
-      // 存储 Attribute
+      // encode diff
+      var preAttribute = this.configService.getAttributeConfig(this.id) || {}; // @ts-ignore
+
+      if (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, _defineProperty({}, type, {
           field: field,
@@ -1465,6 +1474,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         }, // @ts-ignore
         updateOptions);
       }
+
+      return true;
     }
   }, {
     key: "getLayerAttributeConfig",

package/es/core/TextureService.d.ts

@@ -6,9 +6,10 @@ export default class TextureService implements ITextureService {
     private colorTexture;
     private key;
     constructor(layer: ILayer);
-    getColorTexture(colorRamp: IColorRamp): ITexture2D;
-    createColorTexture(colorRamp: IColorRamp): ITexture2D;
-    setColorTexture(texture: ITexture2D, colorRamp: IColorRamp): void;
+    getColorTexture(colorRamp: IColorRamp, domain?: [number, number]): ITexture2D;
+    createColorTexture(colorRamp: IColorRamp, domain?: [number, number]): ITexture2D;
+    setColorTexture(texture: ITexture2D, colorRamp: IColorRamp, domain: [number, number]): void;
     destroy(): void;
+    private getColorRampBar;
     private getTextureKey;
 }

package/es/core/TextureService.js

@@ -1,7 +1,7 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import { TYPES } from '@antv/l7-core';
-import { generateColorRamp } from '@antv/l7-utils';
+import { generateCatRamp, generateColorRamp, generateCustomRamp, generateLinearRamp, generateQuantizeRamp } from '@antv/l7-utils';
 
 var TextureService = /*#__PURE__*/function () {
   function TextureService(layer) {
@@ -14,14 +14,14 @@ var TextureService = /*#__PURE__*/function () {
 
   _createClass(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;
@@ -29,9 +29,9 @@ var TextureService = /*#__PURE__*/function () {
     }
   }, {
     key: "createColorTexture",
-    value: function createColorTexture(colorRamp) {
+    value: function createColorTexture(colorRamp, domain) {
       var createTexture2D = this.rendererService.createTexture2D;
-      var imageData = generateColorRamp(colorRamp);
+      var imageData = this.getColorRampBar(colorRamp, domain);
       var texture = createTexture2D({
         data: imageData.data,
         width: imageData.width,
@@ -43,8 +43,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;
     }
   }, {
@@ -54,10 +54,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 generateCatRamp(colorRamp);
+
+        case 'quantize':
+          return generateQuantizeRamp(colorRamp);
+
+        case 'custom':
+          return generateCustomRamp(colorRamp, domain);
+
+        case 'linear':
+          return generateLinearRamp(colorRamp, domain);
+
+        default:
+          return 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('_'));
     }
   }]);
 

package/es/core/interface.d.ts

@@ -63,6 +63,10 @@ export interface ILineLayerStyleOptions extends IBaseLayerStyleOptions {
     enablePicking?: boolean;
     workerEnabled?: boolean;
 }
+export declare enum SizeUnitType {
+    pixel = 0,
+    meter = 1
+}
 export interface IPointLayerStyleOptions extends IBaseLayerStyleOptions {
     tileOrigin?: number[];
     coord?: string;
@@ -88,7 +92,7 @@ export interface IPointLayerStyleOptions extends IBaseLayerStyleOptions {
     };
     lightEnable: boolean;
     offsets?: styleOffset;
-    unit?: string;
+    unit?: SizeUnitType;
     rotation?: number;
     speed?: number;
     featureId?: string;
@@ -145,11 +149,6 @@ export interface IImageLayerStyleOptions extends IBaseLayerStyleOptions {
     rampColors?: IColorRamp;
     rampColorsData?: ImageData | IImagedata;
     colorTexture?: ITexture2D;
-    pixelConstant?: number;
-    pixelConstantR?: number;
-    pixelConstantG?: number;
-    pixelConstantB?: number;
-    pixelConstantRGB?: number;
 }
 export interface ICityBuildLayerStyleOptions {
     opacity: number;

package/es/core/interface.js

@@ -22,6 +22,13 @@ export var TextureBlend;
   TextureBlend["REPLACE"] = "replace";
 })(TextureBlend || (TextureBlend = {}));
 
+export var SizeUnitType;
+
+(function (SizeUnitType) {
+  SizeUnitType[SizeUnitType["pixel"] = 0] = "pixel";
+  SizeUnitType[SizeUnitType["meter"] = 1] = "meter";
+})(SizeUnitType || (SizeUnitType = {}));
+
 export var CanvasUpdateType;
 
 (function (CanvasUpdateType) {

package/es/line/index.d.ts

@@ -29,7 +29,7 @@ export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
         blend: string;
     } | {
         blend: string;
-    } | {} | {} | {};
+    } | {} | {};
     getModelType(): LineModelType;
     processData(filterData: IParseDataItem[]): IParseDataItem[];
 }

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

@@ -1,4 +1,4 @@
-export type LineModelType = 'arc' | 'arc3d' | 'greatcircle' | 'wall' | 'simple' | 'line' | 'halfLine' | 'linearline' | 'tileLine' | 'earthArc3d';
+export type LineModelType = 'arc' | 'arc3d' | 'greatcircle' | 'wall' | 'simple' | 'line' | 'halfLine' | 'linearline' | 'earthArc3d';
 declare const LineModels: {
     [key in LineModelType]: any;
 };

package/es/line/models/index.js

@@ -6,7 +6,6 @@ import LineHalfModel from "./half";
 import LineModel from "./line";
 import LinearLine from "./linearline";
 import SimpleLineModel from "./simpleLine";
-import TileLineModel from "./tile";
 import LineWallModel from "./wall";
 var LineModels = {
   arc: ArcModel,
@@ -17,7 +16,6 @@ var LineModels = {
   halfLine: LineHalfModel,
   simple: SimpleLineModel,
   linearline: LinearLine,
-  tileLine: TileLineModel,
   earthArc3d: EarthArc3DModel
 };
 export default LineModels;

package/es/plugins/DataMappingPlugin.js

@@ -63,14 +63,11 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
                 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();
               }
@@ -142,9 +139,15 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
 
       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/es/point/index.d.ts

@@ -26,6 +26,6 @@ export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
         blend: string;
     } | {} | {} | {
         blend: string;
-    } | {} | {} | {} | {};
+    } | {} | {};
     getModelType(): PointType;
 }

package/es/point/models/fill.d.ts

@@ -1,10 +1,6 @@
 import { IAnimateOption, IAttribute, IElements, IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class FillModel extends BaseModel {
-    private meter2coord;
-    private meterYScale;
-    private isMeter;
-    private unit;
     getUninforms(): IModelUniform;
     getAnimateUniforms(): IModelUniform;
     getAttribute(): {
@@ -14,11 +10,6 @@ export default class FillModel extends BaseModel {
         elements: IElements;
     };
     initModels(): Promise<IModel[]>;
-    /**
-     * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
-     * @returns
-     */
-    calMeter2Coord(): void;
     buildModels(): Promise<IModel[]>;
     /**
      * 根据 animateOption 的值返回对应的 shader 代码
@@ -32,9 +23,4 @@ export default class FillModel extends BaseModel {
     clearModels(): void;
     protected animateOption2Array(option: Partial<IAnimateOption>): number[];
     protected registerBuiltinAttributes(): void;
-    /**
-     * 判断是否更新点图层的计量单位
-     * @param unit
-     */
-    private updateUnit;
 }

package/es/point/models/fill.js

@@ -1,12 +1,9 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -14,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 { $window, getMask, PointFillTriangulation } from '@antv/l7-utils';
+import { getMask, PointFillTriangulation } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
 
@@ -26,8 +23,8 @@ 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";
-import { Version } from '@antv/l7-maps';
+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";
+import { SizeUnitType } from "../../core/interface";
 
 var FillModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(FillModel, _BaseModel);
@@ -35,25 +32,9 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
   var _super = _createSuper(FillModel);
 
   function FillModel() {
-    var _this;
-
     _classCallCheck(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));
-
-    _defineProperty(_assertThisInitialized(_this), "meter2coord", 1);
-
-    _defineProperty(_assertThisInitialized(_this), "meterYScale", 1);
-
-    _defineProperty(_assertThisInitialized(_this), "isMeter", false);
-
-    _defineProperty(_assertThisInitialized(_this), "unit", 'l7size');
-
-    return _this;
+    return _super.apply(this, arguments);
   }
 
   _createClass(FillModel, [{
@@ -78,9 +59,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,
@@ -126,9 +105,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,
@@ -138,6 +114,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
         u_stroke_opacity: isNumber(strokeOpacity) ? strokeOpacity : 1.0,
         u_stroke_width: isNumber(strokeWidth) ? strokeWidth : 1.0,
         u_stroke_color: this.getStrokeColor(stroke),
+        u_Size_Unit: SizeUnitType[unit],
         u_offsets: this.isOffsetStatic(offsets) ? offsets : [0, 0]
       };
     }
@@ -168,14 +145,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();
             }
@@ -189,50 +165,6 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
 
       return initModels;
     }()
-    /**
-     * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
-     * @returns
-     */
-
-  }, {
-    key: "calMeter2Coord",
-    value: function calMeter2Coord() {
-      var _this$layer$getSource = _slicedToArray(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 = $window === null || $window === void 0 ? void 0 : $window.mapboxgl;
-
-      if (version === 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 () {
@@ -395,29 +327,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 !== Version.DEFUALT && version !== 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;

package/es/point/models/fillmage.d.ts

@@ -13,11 +13,6 @@ export default class FillImageModel extends BaseModel {
         elements: IElements;
     };
     initModels(): Promise<IModel[]>;
-    /**
-     * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
-     * @returns
-     */
-    calMeter2Coord(): void;
     buildModels(): Promise<IModel[]>;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;