@antv/l7-layers 2.8.7 → 2.8.10

package/es/canvas/models/canvas.js

@@ -30,7 +30,7 @@ var CanvaModel = function (_BaseModel) {
 
     _this = _super.call.apply(_super, [this].concat(args));
 
-    _defineProperty(_assertThisInitialized(_this), "updateMode", CanvasUpdateType.AWAYS);
+    _defineProperty(_assertThisInitialized(_this), "updateMode", CanvasUpdateType.ALWAYS);
 
     _defineProperty(_assertThisInitialized(_this), "canvas", void 0);
 
@@ -43,7 +43,12 @@ var CanvaModel = function (_BaseModel) {
           _ref$zIndex = _ref.zIndex,
           zIndex = _ref$zIndex === void 0 ? 10 : _ref$zIndex,
           _ref$update = _ref.update,
-          update = _ref$update === void 0 ? CanvasUpdateType.AWAYS : _ref$update;
+          update = _ref$update === void 0 ? 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 + '';
@@ -56,6 +61,10 @@ var CanvaModel = function (_BaseModel) {
 
         _this.bindListener();
       }
+
+      if (_this.updateMode === CanvasUpdateType.ALWAYS && animateOption.enable) {
+        _this.renderCanvas();
+      }
     });
 
     _defineProperty(_assertThisInitialized(_this), "unBindListener", function () {
@@ -71,7 +80,7 @@ var CanvaModel = function (_BaseModel) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "bindListener", function () {
-      if (_this.updateMode === CanvasUpdateType.AWAYS) {
+      if (_this.updateMode === CanvasUpdateType.ALWAYS) {
         _this.mapService.on('mapchange', _this.renderCanvas);
       } else {
         _this.mapService.on('zoomstart', _this.clearCanvas);
@@ -145,7 +154,7 @@ var CanvaModel = function (_BaseModel) {
     value: function initModels() {
       var _ref3 = this.layer.getLayerConfig(),
           _ref3$update = _ref3.update,
-          update = _ref3$update === void 0 ? CanvasUpdateType.AWAYS : _ref3$update;
+          update = _ref3$update === void 0 ? CanvasUpdateType.ALWAYS : _ref3$update;
 
       this.updateMode = update;
       this.initCanvas();

package/es/canvas/models/canvas.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/canvas/models/canvas.ts"],"names":["BaseModel","CanvasUpdateType","CanvaModel","AWAYS","layer","getLayerConfig","zIndex","update","canvas","style","updateMode","unBindListener","bindListener","mapService","off","renderCanvas","clearCanvas","on","ctx","rendererService","getViewportSize","w","width","h","height","clearRect","viewWidth","viewHeight","prevSize","size","getSize","drawingOnCanvas","document","removeChild","initCanvas","getContainer","createElement","pointerEvents","position","top","left","appendChild","getContext","initModels"],"mappings":"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","sourcesContent":["import BaseModel from '../../core/BaseModel';\nimport {\n  CanvasUpdateType,\n  ICanvasLayerStyleOptions,\n  IDrawingOnCanvas,\n} from '../../core/interface';\n\nexport default class CanvaModel extends BaseModel {\n  protected updateMode: CanvasUpdateType = CanvasUpdateType.AWAYS;\n  protected canvas: HTMLCanvasElement;\n  protected ctx: CanvasRenderingContext2D;\n  protected prevSize: [number, number];\n  public renderUpdate = () => {\n    const {\n      zIndex = 10,\n      update = CanvasUpdateType.AWAYS,\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    if (+this.canvas.style.zIndex === zIndex) {\n      this.canvas.style.zIndex = zIndex + '';\n    }\n    if (this.updateMode !== update) {\n      this.updateMode = update as CanvasUpdateType;\n      this.unBindListener();\n      this.bindListener();\n    }\n  };\n\n  public unBindListener = () => {\n    this.mapService.off('mapchange', this.renderCanvas);\n    this.mapService.off('zoomstart', this.clearCanvas);\n    this.mapService.off('zoomend', this.renderCanvas);\n    this.mapService.off('movestart', this.clearCanvas);\n    this.mapService.off('moveend', this.renderCanvas);\n  };\n\n  public bindListener = () => {\n    if (this.updateMode === CanvasUpdateType.AWAYS) {\n      this.mapService.on('mapchange', this.renderCanvas);\n    } else {\n      this.mapService.on('zoomstart', this.clearCanvas);\n      this.mapService.on('zoomend', this.renderCanvas);\n      this.mapService.on('movestart', this.clearCanvas);\n      this.mapService.on('moveend', this.renderCanvas);\n    }\n  };\n\n  public clearModels(): void {\n    if (this.canvas) {\n      document.removeChild(this.canvas);\n      // @ts-ignore\n      this.canvas = null;\n    }\n    this.unBindListener();\n  }\n\n  public initModels() {\n    const {\n      update = CanvasUpdateType.AWAYS,\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    this.updateMode = update as CanvasUpdateType;\n    this.initCanvas();\n\n    this.renderCanvas();\n\n    this.bindListener();\n\n    this.mapService.getContainer();\n    return [];\n  }\n\n  public initCanvas(): void {\n    const { zIndex } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    const size = this.mapService.getSize();\n    const [width, height] = size;\n    const {\n      width: viewWidth,\n      height: viewHeight,\n    } = this.rendererService.getViewportSize();\n    this.prevSize = [viewWidth, viewHeight];\n\n    const canvas = document.createElement('canvas');\n    this.canvas = canvas;\n    canvas.width = viewWidth;\n    canvas.height = viewHeight;\n    canvas.style.pointerEvents = 'none';\n    canvas.style.width = width + 'px';\n    canvas.style.height = height + 'px';\n    canvas.style.position = 'absolute';\n    canvas.style.top = '0';\n    canvas.style.left = '0';\n    canvas.style.zIndex = zIndex + '';\n    this.mapService.getContainer()?.appendChild(canvas);\n\n    const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;\n    this.ctx = ctx;\n  }\n\n  public clearCanvas = () => {\n    if (this.ctx) {\n      const { width: w, height: h } = this.rendererService.getViewportSize();\n      this.ctx.clearRect(0, 0, w, h);\n    }\n  };\n\n  public renderCanvas = () => {\n    const {\n      width: viewWidth,\n      height: viewHeight,\n    } = this.rendererService.getViewportSize();\n    if (this.prevSize[0] !== viewWidth || this.prevSize[1] !== viewHeight) {\n      this.prevSize = [viewWidth, viewHeight];\n      const size = this.mapService.getSize();\n      const [width, height] = size;\n      this.canvas.width = viewWidth;\n      this.canvas.height = viewHeight;\n      this.canvas.style.width = width + 'px';\n      this.canvas.style.height = height + 'px';\n    }\n\n    const {\n      drawingOnCanvas,\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n\n    if (this.ctx) {\n      drawingOnCanvas({\n        canvas: this.canvas,\n        ctx: this.ctx,\n        mapService: this.mapService,\n        size: [viewWidth, viewHeight],\n      });\n    }\n  };\n\n  public buildModels() {\n    return this.initModels();\n  }\n\n  protected registerBuiltinAttributes() {\n    return;\n  }\n}\n"],"file":"canvas.js"}
+{"version":3,"sources":["../../../src/canvas/models/canvas.ts"],"names":["BaseModel","CanvasUpdateType","CanvaModel","ALWAYS","layer","getLayerConfig","zIndex","update","animateOption","enable","duration","canvas","style","updateMode","unBindListener","bindListener","renderCanvas","mapService","off","clearCanvas","on","ctx","rendererService","getViewportSize","w","width","h","height","clearRect","viewWidth","viewHeight","prevSize","size","getSize","drawingOnCanvas","document","removeChild","initCanvas","getContainer","createElement","pointerEvents","position","top","left","appendChild","getContext","initModels"],"mappings":"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","sourcesContent":["import { IModelUniform } from '@antv/l7-core';\nimport BaseModel from '../../core/BaseModel';\nimport {\n  CanvasUpdateType,\n  ICanvasLayerStyleOptions,\n  IDrawingOnCanvas,\n} from '../../core/interface';\n\nexport default class CanvaModel extends BaseModel {\n  protected updateMode: CanvasUpdateType = CanvasUpdateType.ALWAYS;\n  protected canvas: HTMLCanvasElement;\n  protected ctx: CanvasRenderingContext2D;\n  protected prevSize: [number, number];\n\n  public renderUpdate = () => {\n    const {\n      zIndex = 10,\n      update = CanvasUpdateType.ALWAYS,\n      animateOption = { enable: false, duration: 20 },\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    if (+this.canvas.style.zIndex === zIndex) {\n      this.canvas.style.zIndex = zIndex + '';\n    }\n    if (this.updateMode !== update) {\n      this.updateMode = update as CanvasUpdateType;\n      this.unBindListener();\n      this.bindListener();\n    }\n    if (this.updateMode === CanvasUpdateType.ALWAYS && animateOption.enable) {\n      this.renderCanvas();\n    }\n  };\n\n  public unBindListener = () => {\n    this.mapService.off('mapchange', this.renderCanvas);\n    this.mapService.off('zoomstart', this.clearCanvas);\n    this.mapService.off('zoomend', this.renderCanvas);\n    this.mapService.off('movestart', this.clearCanvas);\n    this.mapService.off('moveend', this.renderCanvas);\n  };\n\n  public bindListener = () => {\n    if (this.updateMode === CanvasUpdateType.ALWAYS) {\n      this.mapService.on('mapchange', this.renderCanvas);\n    } else {\n      this.mapService.on('zoomstart', this.clearCanvas);\n      this.mapService.on('zoomend', this.renderCanvas);\n      this.mapService.on('movestart', this.clearCanvas);\n      this.mapService.on('moveend', this.renderCanvas);\n    }\n  };\n\n  public clearModels(): void {\n    if (this.canvas) {\n      document.removeChild(this.canvas);\n      // @ts-ignore\n      this.canvas = null;\n    }\n    this.unBindListener();\n  }\n\n  public initModels() {\n    const {\n      update = CanvasUpdateType.ALWAYS,\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    this.updateMode = update as CanvasUpdateType;\n    this.initCanvas();\n\n    this.renderCanvas();\n\n    this.bindListener();\n\n    this.mapService.getContainer();\n    return [];\n  }\n\n  public initCanvas(): void {\n    const { zIndex } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    const size = this.mapService.getSize();\n    const [width, height] = size;\n    const {\n      width: viewWidth,\n      height: viewHeight,\n    } = this.rendererService.getViewportSize();\n    this.prevSize = [viewWidth, viewHeight];\n\n    const canvas = document.createElement('canvas');\n    this.canvas = canvas;\n    canvas.width = viewWidth;\n    canvas.height = viewHeight;\n    canvas.style.pointerEvents = 'none';\n    canvas.style.width = width + 'px';\n    canvas.style.height = height + 'px';\n    canvas.style.position = 'absolute';\n    canvas.style.top = '0';\n    canvas.style.left = '0';\n    canvas.style.zIndex = zIndex + '';\n    this.mapService.getContainer()?.appendChild(canvas);\n\n    const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;\n    this.ctx = ctx;\n  }\n\n  public clearCanvas = () => {\n    if (this.ctx) {\n      const { width: w, height: h } = this.rendererService.getViewportSize();\n      this.ctx.clearRect(0, 0, w, h);\n    }\n  };\n\n  public renderCanvas = () => {\n    const {\n      width: viewWidth,\n      height: viewHeight,\n    } = this.rendererService.getViewportSize();\n    if (this.prevSize[0] !== viewWidth || this.prevSize[1] !== viewHeight) {\n      this.prevSize = [viewWidth, viewHeight];\n      const size = this.mapService.getSize();\n      const [width, height] = size;\n      this.canvas.width = viewWidth;\n      this.canvas.height = viewHeight;\n      this.canvas.style.width = width + 'px';\n      this.canvas.style.height = height + 'px';\n    }\n\n    const {\n      drawingOnCanvas,\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n\n    if (this.ctx) {\n      drawingOnCanvas({\n        canvas: this.canvas,\n        ctx: this.ctx,\n        mapService: this.mapService,\n        size: [viewWidth, viewHeight],\n      });\n    }\n  };\n\n  public buildModels() {\n    return this.initModels();\n  }\n\n  protected registerBuiltinAttributes() {\n    return;\n  }\n}\n"],"file":"canvas.js"}

package/es/core/interface.d.ts

@@ -92,7 +92,7 @@ export interface IGeometryLayerStyleOptions {
     heightSegments?: number;
 }
 export declare enum CanvasUpdateType {
-    'AWAYS' = "aways",
+    'ALWAYS' = "always",
     'DRAGEND' = "dragend"
 }
 export interface IDrawingOnCanvas {
@@ -105,6 +105,7 @@ export interface ICanvasLayerStyleOptions {
     zIndex: number;
     update: CanvasUpdateType | string;
     drawingOnCanvas: (option: IDrawingOnCanvas) => void;
+    animateOption: IAnimateOption;
 }
 export interface IHeatMapLayerStyleOptions {
     opacity: number;

package/es/core/interface.js

@@ -8,7 +8,7 @@ export var lineStyleType;
 export var CanvasUpdateType;
 
 (function (CanvasUpdateType) {
-  CanvasUpdateType["AWAYS"] = "aways";
+  CanvasUpdateType["ALWAYS"] = "always";
   CanvasUpdateType["DRAGEND"] = "dragend";
 })(CanvasUpdateType || (CanvasUpdateType = {}));
 //# sourceMappingURL=interface.js.map

package/es/core/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/core/interface.ts"],"names":["lineStyleType","CanvasUpdateType"],"mappings":"AASA,WAAYA,aAAZ;;WAAYA,a;AAAAA,EAAAA,a,CAAAA,a;AAAAA,EAAAA,a,CAAAA,a;GAAAA,a,KAAAA,a;;AAmHZ,WAAYC,gBAAZ;;WAAYA,gB;AAAAA,EAAAA,gB;AAAAA,EAAAA,gB;GAAAA,gB,KAAAA,gB","sourcesContent":["import { IAnimateOption, IMapService } from '@antv/l7-core';\nimport { generateColorRamp, getMask, IColorRamp } from '@antv/l7-utils';\nimport { styleColor, styleOffset, styleSingle } from '../core/BaseModel';\nimport {\n  anchorType,\n  getGlyphQuads,\n  IGlyphQuad,\n  shapeText,\n} from '../utils/symbol-layout';\nexport enum lineStyleType {\n  'solid' = 0.0,\n  'dash' = 1.0,\n}\n\nexport interface ILineLayerStyleOptions {\n  opacity: styleSingle;\n  lineType?: keyof typeof lineStyleType; // 可选参数、线类型(all - dash/solid)\n  dashArray?: [number, number]; //  可选参数、虚线间隔\n  segmentNumber?: number;\n\n  forward?: boolean; // 可选参数、是否反向(arcLine)\n  lineTexture?: boolean; // 可选参数、是否开启纹理贴图功能(all)\n  iconStep?: number; // 可选参数、纹理贴图步长(all)\n  iconStepCount?: number; // 可选参数、纹理贴图间隔\n  textureBlend?: string; // 可选参数、供给纹理贴图使用(all)\n  sourceColor?: string; // 可选参数、设置渐变色的起始颜色(all)\n  targetColor?: string; // 可选参数、设置渐变色的终点颜色(all)\n  thetaOffset?: number; // 可选参数、设置弧线的偏移量\n\n  globalArcHeight?: number; // 可选参数、地球模式下 3D 弧线的高度\n  vertexHeightScale?: number; // 可选参数、lineLayer vertex height scale\n\n  borderWidth?: number; // 可选参数 线边框宽度\n  borderColor?: string; // 可选参数 线边框颜色\n\n  heightfixed?: boolean; // 可选参数 高度是否固定\n\n  mask?: boolean; // 可选参数 时候允许蒙层\n  maskInside?: boolean; // 可选参数 控制图层是否显示在蒙层的内部\n}\n\nexport interface IPointLayerStyleOptions {\n  opacity: number;\n  strokeOpacity: number;\n  strokeWidth: number;\n  stroke: string;\n\n  textOffset?: [number, number];\n  textAnchor?: anchorType;\n  spacing?: number;\n  padding?: [number, number];\n  halo?: number;\n  gamma?: number;\n  fontWeight?: string;\n  fontFamily?: string;\n  textAllowOverlap?: boolean;\n\n  // cylinder\n  pickLight?: boolean;\n  depth?: boolean;\n  sourceColor?: string; // 可选参数、设置渐变色的起始颜色(all)\n  targetColor?: string; // 可选参数、设置渐变色的终点颜色(all)\n  opacityLinear?: {\n    enable: boolean;\n    dir: string;\n  };\n  lightEnable: boolean;\n  heightfixed?: boolean; // 圆柱体高度是否固定（不随 zoom 发生变化）\n\n  offsets?: styleOffset;\n  blend?: string;\n  unit?: string;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  rotation?: number; // angle\n  speed?: number;\n  animateOption: IAnimateOption;\n}\n\nexport interface IPolygonLayerStyleOptions {\n  opacity: styleSingle;\n\n  opacityLinear: {\n    enable: boolean;\n    dir: string;\n  };\n\n  heightfixed?: boolean; // 挤出几何体高度是否固定（不随 zoom 发生变化）\n\n  pickLight: boolean;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  // water\n  waterTexture?: string;\n  speed?: number;\n  // ocean\n  watercolor?: string;\n  watercolor2?: string;\n}\n\nexport interface IImageLayerStyleOptions {\n  opacity: number;\n  mask?: boolean;\n  maskInside?: boolean;\n}\n\nexport interface IGeometryLayerStyleOptions {\n  opacity: number;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  mapTexture?: string;\n\n  // planeGeometry\n  center?: [number, number];\n  width?: number;\n  height?: number;\n\n  widthSegments?: number;\n  heightSegments?: number;\n}\n\nexport enum CanvasUpdateType {\n  'AWAYS' = 'aways',\n  'DRAGEND' = 'dragend',\n}\n\nexport interface IDrawingOnCanvas {\n  canvas: HTMLCanvasElement;\n  ctx: CanvasRenderingContext2D;\n  mapService: IMapService;\n  size: [number, number];\n}\nexport interface ICanvasLayerStyleOptions {\n  zIndex: number;\n  update: CanvasUpdateType | string;\n  drawingOnCanvas: (option: IDrawingOnCanvas) => void;\n}\n\nexport interface IHeatMapLayerStyleOptions {\n  opacity: number;\n  intensity: number;\n  radius: number;\n  angle: number;\n  rampColors: IColorRamp;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  coverage?: number;\n}\n\nexport interface IRasterLayerStyleOptions {\n  opacity: number;\n  domain: [number, number];\n  noDataValue: number;\n  clampLow: boolean;\n  clampHigh: boolean;\n  rampColors: IColorRamp;\n  mask?: boolean;\n  maskInside?: boolean;\n}\n"],"file":"interface.js"}
+{"version":3,"sources":["../../src/core/interface.ts"],"names":["lineStyleType","CanvasUpdateType"],"mappings":"AASA,WAAYA,aAAZ;;WAAYA,a;AAAAA,EAAAA,a,CAAAA,a;AAAAA,EAAAA,a,CAAAA,a;GAAAA,a,KAAAA,a;;AAmHZ,WAAYC,gBAAZ;;WAAYA,gB;AAAAA,EAAAA,gB;AAAAA,EAAAA,gB;GAAAA,gB,KAAAA,gB","sourcesContent":["import { IAnimateOption, IMapService } from '@antv/l7-core';\nimport { generateColorRamp, getMask, IColorRamp } from '@antv/l7-utils';\nimport { styleColor, styleOffset, styleSingle } from '../core/BaseModel';\nimport {\n  anchorType,\n  getGlyphQuads,\n  IGlyphQuad,\n  shapeText,\n} from '../utils/symbol-layout';\nexport enum lineStyleType {\n  'solid' = 0.0,\n  'dash' = 1.0,\n}\n\nexport interface ILineLayerStyleOptions {\n  opacity: styleSingle;\n  lineType?: keyof typeof lineStyleType; // 可选参数、线类型(all - dash/solid)\n  dashArray?: [number, number]; //  可选参数、虚线间隔\n  segmentNumber?: number;\n\n  forward?: boolean; // 可选参数、是否反向(arcLine)\n  lineTexture?: boolean; // 可选参数、是否开启纹理贴图功能(all)\n  iconStep?: number; // 可选参数、纹理贴图步长(all)\n  iconStepCount?: number; // 可选参数、纹理贴图间隔\n  textureBlend?: string; // 可选参数、供给纹理贴图使用(all)\n  sourceColor?: string; // 可选参数、设置渐变色的起始颜色(all)\n  targetColor?: string; // 可选参数、设置渐变色的终点颜色(all)\n  thetaOffset?: number; // 可选参数、设置弧线的偏移量\n\n  globalArcHeight?: number; // 可选参数、地球模式下 3D 弧线的高度\n  vertexHeightScale?: number; // 可选参数、lineLayer vertex height scale\n\n  borderWidth?: number; // 可选参数 线边框宽度\n  borderColor?: string; // 可选参数 线边框颜色\n\n  heightfixed?: boolean; // 可选参数 高度是否固定\n\n  mask?: boolean; // 可选参数 时候允许蒙层\n  maskInside?: boolean; // 可选参数 控制图层是否显示在蒙层的内部\n}\n\nexport interface IPointLayerStyleOptions {\n  opacity: number;\n  strokeOpacity: number;\n  strokeWidth: number;\n  stroke: string;\n\n  textOffset?: [number, number];\n  textAnchor?: anchorType;\n  spacing?: number;\n  padding?: [number, number];\n  halo?: number;\n  gamma?: number;\n  fontWeight?: string;\n  fontFamily?: string;\n  textAllowOverlap?: boolean;\n\n  // cylinder\n  pickLight?: boolean;\n  depth?: boolean;\n  sourceColor?: string; // 可选参数、设置渐变色的起始颜色(all)\n  targetColor?: string; // 可选参数、设置渐变色的终点颜色(all)\n  opacityLinear?: {\n    enable: boolean;\n    dir: string;\n  };\n  lightEnable: boolean;\n  heightfixed?: boolean; // 圆柱体高度是否固定（不随 zoom 发生变化）\n\n  offsets?: styleOffset;\n  blend?: string;\n  unit?: string;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  rotation?: number; // angle\n  speed?: number;\n  animateOption: IAnimateOption;\n}\n\nexport interface IPolygonLayerStyleOptions {\n  opacity: styleSingle;\n\n  opacityLinear: {\n    enable: boolean;\n    dir: string;\n  };\n\n  heightfixed?: boolean; // 挤出几何体高度是否固定（不随 zoom 发生变化）\n\n  pickLight: boolean;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  // water\n  waterTexture?: string;\n  speed?: number;\n  // ocean\n  watercolor?: string;\n  watercolor2?: string;\n}\n\nexport interface IImageLayerStyleOptions {\n  opacity: number;\n  mask?: boolean;\n  maskInside?: boolean;\n}\n\nexport interface IGeometryLayerStyleOptions {\n  opacity: number;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  mapTexture?: string;\n\n  // planeGeometry\n  center?: [number, number];\n  width?: number;\n  height?: number;\n\n  widthSegments?: number;\n  heightSegments?: number;\n}\n\nexport enum CanvasUpdateType {\n  'ALWAYS' = 'always',\n  'DRAGEND' = 'dragend',\n}\n\nexport interface IDrawingOnCanvas {\n  canvas: HTMLCanvasElement;\n  ctx: CanvasRenderingContext2D;\n  mapService: IMapService;\n  size: [number, number];\n}\nexport interface ICanvasLayerStyleOptions {\n  zIndex: number;\n  update: CanvasUpdateType | string;\n  drawingOnCanvas: (option: IDrawingOnCanvas) => void;\n  animateOption: IAnimateOption;\n}\n\nexport interface IHeatMapLayerStyleOptions {\n  opacity: number;\n  intensity: number;\n  radius: number;\n  angle: number;\n  rampColors: IColorRamp;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  coverage?: number;\n}\n\nexport interface IRasterLayerStyleOptions {\n  opacity: number;\n  domain: [number, number];\n  noDataValue: number;\n  clampLow: boolean;\n  clampHigh: boolean;\n  rampColors: IColorRamp;\n  mask?: boolean;\n  maskInside?: boolean;\n}\n"],"file":"interface.js"}

package/es/plugins/DataMappingPlugin.d.ts

@@ -9,5 +9,8 @@ export default class DataMappingPlugin implements ILayerPlugin {
     }): void;
     private generateMaping;
     private mapping;
+    private adjustData2Amap2Coordinates;
+    private adjustData2SimpleCoordinates;
+    private unProjectCoordinates;
     private applyAttributeMapping;
 }

package/es/plugins/DataMappingPlugin.js

@@ -13,6 +13,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import { TYPES } from '@antv/l7-core';
+import { Version } from '@antv/l7-maps';
 import { isColor, rgb2arr } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
 import 'reflect-metadata';
@@ -133,15 +134,23 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
         });
         return encodeRecord;
       });
+      this.adjustData2Amap2Coordinates(mappedData);
+      this.adjustData2SimpleCoordinates(mappedData);
+      return mappedData;
+    }
+  }, {
+    key: "adjustData2Amap2Coordinates",
+    value: function adjustData2Amap2Coordinates(mappedData) {
+      var _this4 = this;
 
-      if (mappedData.length > 0 && this.mapService.version === 'GAODE2.x') {
+      if (mappedData.length > 0 && this.mapService.version === Version['GAODE2.x']) {
         if (typeof mappedData[0].coordinates[0] === 'number') {
           mappedData.filter(function (d) {
             return !d.originCoordinates;
           }).map(function (d) {
             d.version = 'GAODE2.x';
             d.originCoordinates = _cloneDeep(d.coordinates);
-            d.coordinates = _this3.mapService.lngLatToCoord(d.coordinates);
+            d.coordinates = _this4.mapService.lngLatToCoord(d.coordinates);
           });
         } else {
           mappedData.filter(function (d) {
@@ -149,12 +158,51 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IGlobalConfig
           }).map(function (d) {
             d.version = 'GAODE2.x';
             d.originCoordinates = _cloneDeep(d.coordinates);
-            d.coordinates = _this3.mapService.lngLatToCoords(d.coordinates);
+            d.coordinates = _this4.mapService.lngLatToCoords(d.coordinates);
           });
         }
       }
+    }
+  }, {
+    key: "adjustData2SimpleCoordinates",
+    value: function adjustData2SimpleCoordinates(mappedData) {
+      var _this5 = this;
+
+      if (mappedData.length > 0 && this.mapService.version === Version.SIMPLE) {
+        mappedData.map(function (d) {
+          if (!d.simpleCoordinate) {
+            d.coordinates = _this5.unProjectCoordinates(d.coordinates);
+            d.simpleCoordinate = true;
+          }
+        });
+      }
+    }
+  }, {
+    key: "unProjectCoordinates",
+    value: function unProjectCoordinates(coordinates) {
+      var _this6 = this;
 
-      return mappedData;
+      if (typeof coordinates[0] === 'number') {
+        return this.mapService.simpleMapCoord.unproject(coordinates);
+      }
+
+      if (coordinates[0] && coordinates[0][0] instanceof Array) {
+        var coords = [];
+        coordinates.map(function (coord) {
+          var c1 = [];
+          coord.map(function (co) {
+            c1.push(_this6.mapService.simpleMapCoord.unproject(co));
+          });
+          coords.push(c1);
+        });
+        return coords;
+      } else {
+        var _coords = [];
+        coordinates.map(function (coord) {
+          _coords.push(_this6.mapService.simpleMapCoord.unproject(coord));
+        });
+        return _coords;
+      }
     }
   }, {
     key: "applyAttributeMapping",

package/es/plugins/DataMappingPlugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/DataMappingPlugin.ts"],"names":["TYPES","isColor","rgb2arr","inject","injectable","DataMappingPlugin","IGlobalConfigService","IMapService","IFontService","layer","styleAttributeService","hooks","init","tap","generateMaping","beforeRenderData","dataState","dataMappingNeedUpdate","beforeRender","layerModelNeedUpdate","bottomColor","getBottomColor","attributes","getLayerStyleAttributes","filter","getLayerStyleAttribute","dataArray","getSource","data","attributesToRemapping","attribute","needRemapping","filterData","scale","record","applyAttributeMapping","length","setEncodedData","mapping","undefined","getEncodedData","emit","predata","minimumColor","mappedData","map","i","preRecord","encodeRecord","id","_id","coordinates","forEach","values","name","c","Array","isArray","shape","fontService","getIconFontKey","mapService","version","d","originCoordinates","lngLatToCoord","lngLatToCoords","scalers","params","field","hasOwnProperty","type","push","mappingResult"],"mappings":"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","sourcesContent":["import {\n  IEncodeFeature,\n  IFontService,\n  IGlobalConfigService,\n  ILayer,\n  ILayerPlugin,\n  ILngLat,\n  IMapService,\n  IParseDataItem,\n  IStyleAttribute,\n  IStyleAttributeService,\n  TYPES,\n} from '@antv/l7-core';\nimport { isColor, rgb2arr, unProjectFlat } from '@antv/l7-utils';\nimport { inject, injectable } from 'inversify';\nimport { cloneDeep } from 'lodash';\nimport 'reflect-metadata';\n\n@injectable()\nexport default class DataMappingPlugin implements ILayerPlugin {\n  @inject(TYPES.IGlobalConfigService)\n  private readonly configService: IGlobalConfigService;\n\n  @inject(TYPES.IMapService)\n  private readonly mapService: IMapService;\n\n  @inject(TYPES.IFontService)\n  private readonly fontService: IFontService;\n\n  public apply(\n    layer: ILayer,\n    {\n      styleAttributeService,\n    }: { styleAttributeService: IStyleAttributeService },\n  ) {\n    layer.hooks.init.tap('DataMappingPlugin', () => {\n      // 初始化重新生成 map\n      this.generateMaping(layer, { styleAttributeService });\n    });\n\n    layer.hooks.beforeRenderData.tap('DataMappingPlugin', () => {\n      layer.dataState.dataMappingNeedUpdate = false;\n      this.generateMaping(layer, { styleAttributeService });\n      return true;\n    });\n\n    // remapping before render\n    layer.hooks.beforeRender.tap('DataMappingPlugin', () => {\n      if (layer.layerModelNeedUpdate) {\n        return;\n      }\n      const bottomColor = layer.getBottomColor();\n      const attributes = styleAttributeService.getLayerStyleAttributes() || [];\n      const filter = styleAttributeService.getLayerStyleAttribute('filter');\n      const { dataArray } = layer.getSource().data;\n      const attributesToRemapping = attributes.filter(\n        (attribute) => attribute.needRemapping, // 如果filter变化\n      );\n      let filterData = dataArray;\n      // 数据过滤完 再执行数据映射\n      if (filter?.needRemapping && filter?.scale) {\n        filterData = dataArray.filter((record: IParseDataItem) => {\n          return this.applyAttributeMapping(filter, record, bottomColor)[0];\n        });\n      }\n      if (attributesToRemapping.length) {\n        // 过滤数据\n        if (filter?.needRemapping) {\n          layer.setEncodedData(\n            this.mapping(attributes, filterData, undefined, bottomColor),\n          );\n          filter.needRemapping = false;\n        } else {\n          layer.setEncodedData(\n            this.mapping(\n              attributesToRemapping,\n              filterData,\n              layer.getEncodedData(),\n              bottomColor,\n            ),\n          );\n        }\n        // 处理文本更新\n        layer.emit('remapping', null);\n      }\n    });\n  }\n  private generateMaping(\n    layer: ILayer,\n    {\n      styleAttributeService,\n    }: { styleAttributeService: IStyleAttributeService },\n  ) {\n    const bottomColor = layer.getBottomColor();\n    const attributes = styleAttributeService.getLayerStyleAttributes() || [];\n    const filter = styleAttributeService.getLayerStyleAttribute('filter');\n    const { dataArray } = layer.getSource().data;\n    let filterData = dataArray;\n    // 数据过滤完 再执行数据映射\n    if (filter?.scale) {\n      filterData = dataArray.filter((record: IParseDataItem) => {\n        return this.applyAttributeMapping(filter, record, bottomColor)[0];\n      });\n    }\n    layer.setEncodedData(\n      this.mapping(attributes, filterData, undefined, bottomColor),\n    );\n  }\n\n  private mapping(\n    attributes: IStyleAttribute[],\n    data: IParseDataItem[],\n    predata?: IEncodeFeature[],\n    minimumColor?: string,\n  ): IEncodeFeature[] {\n    // console.log('data', data)\n    const mappedData = data.map((record: IParseDataItem, i) => {\n      const preRecord = predata ? predata[i] : {};\n      const encodeRecord: IEncodeFeature = {\n        id: record._id,\n        coordinates: record.coordinates,\n        ...preRecord,\n      };\n      // console.log('attributes', attributes)\n      attributes\n        .filter((attribute) => attribute.scale !== undefined)\n        .forEach((attribute: IStyleAttribute) => {\n          // console.log('attribute', attribute)\n          // console.log('record', record)\n          let values = this.applyAttributeMapping(\n            attribute,\n            record,\n            minimumColor,\n          );\n          // console.log('values', values)\n          attribute.needRemapping = false;\n\n          // TODO: 支持每个属性配置 postprocess\n          if (attribute.name === 'color') {\n            // console.log('attribute', attribute)\n            values = values.map((c: unknown) => {\n              return rgb2arr(c as string);\n            });\n          }\n          // @ts-ignore\n          encodeRecord[attribute.name] =\n            Array.isArray(values) && values.length === 1 ? values[0] : values;\n\n          // 增加对 layer/text/iconfont unicode 映射的解析\n          if (attribute.name === 'shape') {\n            encodeRecord.shape = this.fontService.getIconFontKey(\n              encodeRecord[attribute.name] as string,\n            );\n          }\n        });\n      return encodeRecord;\n    }) as IEncodeFeature[];\n    // console.log('mappedData', mappedData)\n\n    // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移\n    if (mappedData.length > 0 && this.mapService.version === 'GAODE2.x') {\n      if (typeof mappedData[0].coordinates[0] === 'number') {\n        // 单个的点数据\n        // @ts-ignore\n        mappedData\n          // TODO: 避免经纬度被重复计算导致坐标位置偏移\n          .filter((d) => !d.originCoordinates)\n          .map((d) => {\n            d.version = 'GAODE2.x';\n            // @ts-ignore\n            d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）\n            // @ts-ignore\n            d.coordinates = this.mapService.lngLatToCoord(d.coordinates);\n            // d.coordinates = this.mapService.lngLatToCoord(unProjectFlat(d.coordinates));\n          });\n      } else {\n        // 连续的线、面数据\n        // @ts-ignore\n        mappedData\n          // TODO: 避免经纬度被重复计算导致坐标位置偏移\n          .filter((d) => !d.originCoordinates)\n          .map((d) => {\n            d.version = 'GAODE2.x';\n            // @ts-ignore\n            d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）\n            // @ts-ignore\n            d.coordinates = this.mapService.lngLatToCoords(d.coordinates);\n          });\n      }\n    }\n    // console.log('mappedData', mappedData)\n    return mappedData;\n  }\n\n  private applyAttributeMapping(\n    attribute: IStyleAttribute,\n    record: { [key: string]: unknown },\n    minimumColor?: string,\n  ) {\n    if (!attribute.scale) {\n      return [];\n    }\n    const scalers = attribute?.scale?.scalers || [];\n    const params: unknown[] = [];\n\n    scalers.forEach(({ field }) => {\n      if (\n        record.hasOwnProperty(field) ||\n        attribute.scale?.type === 'variable'\n      ) {\n        // TODO:多字段，常量\n        params.push(record[field]);\n      }\n    });\n    // console.log('params', params)\n    // console.log('attribute', attribute)\n\n    const mappingResult = attribute.mapping ? attribute.mapping(params) : [];\n    if (attribute.name === 'color' && !isColor(mappingResult[0])) {\n      return [minimumColor];\n    }\n    return mappingResult;\n    // return attribute.mapping ? attribute.mapping(params) : [];\n  }\n}\n"],"file":"DataMappingPlugin.js"}
+{"version":3,"sources":["../../src/plugins/DataMappingPlugin.ts"],"names":["TYPES","Version","isColor","rgb2arr","inject","injectable","DataMappingPlugin","IGlobalConfigService","IMapService","IFontService","layer","styleAttributeService","hooks","init","tap","generateMaping","beforeRenderData","dataState","dataMappingNeedUpdate","beforeRender","layerModelNeedUpdate","bottomColor","getBottomColor","attributes","getLayerStyleAttributes","filter","getLayerStyleAttribute","dataArray","getSource","data","attributesToRemapping","attribute","needRemapping","filterData","scale","record","applyAttributeMapping","length","setEncodedData","mapping","undefined","getEncodedData","emit","predata","minimumColor","mappedData","map","i","preRecord","encodeRecord","id","_id","coordinates","forEach","values","name","c","Array","isArray","shape","fontService","getIconFontKey","adjustData2Amap2Coordinates","adjustData2SimpleCoordinates","mapService","version","d","originCoordinates","lngLatToCoord","lngLatToCoords","SIMPLE","simpleCoordinate","unProjectCoordinates","simpleMapCoord","unproject","coords","coord","c1","co","push","scalers","params","field","hasOwnProperty","type","mappingResult"],"mappings":"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","sourcesContent":["import {\n  IEncodeFeature,\n  IFontService,\n  IGlobalConfigService,\n  ILayer,\n  ILayerPlugin,\n  ILngLat,\n  IMapService,\n  IParseDataItem,\n  IStyleAttribute,\n  IStyleAttributeService,\n  TYPES,\n} from '@antv/l7-core';\nimport { Version } from '@antv/l7-maps';\nimport { isColor, rgb2arr, unProjectFlat } from '@antv/l7-utils';\nimport { inject, injectable } from 'inversify';\nimport { cloneDeep } from 'lodash';\nimport 'reflect-metadata';\n\n@injectable()\nexport default class DataMappingPlugin implements ILayerPlugin {\n  @inject(TYPES.IGlobalConfigService)\n  private readonly configService: IGlobalConfigService;\n\n  @inject(TYPES.IMapService)\n  private readonly mapService: IMapService;\n\n  @inject(TYPES.IFontService)\n  private readonly fontService: IFontService;\n\n  public apply(\n    layer: ILayer,\n    {\n      styleAttributeService,\n    }: { styleAttributeService: IStyleAttributeService },\n  ) {\n    layer.hooks.init.tap('DataMappingPlugin', () => {\n      // 初始化重新生成 map\n      this.generateMaping(layer, { styleAttributeService });\n    });\n\n    layer.hooks.beforeRenderData.tap('DataMappingPlugin', () => {\n      layer.dataState.dataMappingNeedUpdate = false;\n      this.generateMaping(layer, { styleAttributeService });\n      return true;\n    });\n\n    // remapping before render\n    layer.hooks.beforeRender.tap('DataMappingPlugin', () => {\n      if (layer.layerModelNeedUpdate) {\n        return;\n      }\n      const bottomColor = layer.getBottomColor();\n      const attributes = styleAttributeService.getLayerStyleAttributes() || [];\n      const filter = styleAttributeService.getLayerStyleAttribute('filter');\n      const { dataArray } = layer.getSource().data;\n      const attributesToRemapping = attributes.filter(\n        (attribute) => attribute.needRemapping, // 如果filter变化\n      );\n      let filterData = dataArray;\n      // 数据过滤完 再执行数据映射\n      if (filter?.needRemapping && filter?.scale) {\n        filterData = dataArray.filter((record: IParseDataItem) => {\n          return this.applyAttributeMapping(filter, record, bottomColor)[0];\n        });\n      }\n      if (attributesToRemapping.length) {\n        // 过滤数据\n        if (filter?.needRemapping) {\n          layer.setEncodedData(\n            this.mapping(attributes, filterData, undefined, bottomColor),\n          );\n          filter.needRemapping = false;\n        } else {\n          layer.setEncodedData(\n            this.mapping(\n              attributesToRemapping,\n              filterData,\n              layer.getEncodedData(),\n              bottomColor,\n            ),\n          );\n        }\n        // 处理文本更新\n        layer.emit('remapping', null);\n      }\n    });\n  }\n  private generateMaping(\n    layer: ILayer,\n    {\n      styleAttributeService,\n    }: { styleAttributeService: IStyleAttributeService },\n  ) {\n    const bottomColor = layer.getBottomColor();\n    const attributes = styleAttributeService.getLayerStyleAttributes() || [];\n    const filter = styleAttributeService.getLayerStyleAttribute('filter');\n    const { dataArray } = layer.getSource().data;\n    let filterData = dataArray;\n    // 数据过滤完 再执行数据映射\n    if (filter?.scale) {\n      filterData = dataArray.filter((record: IParseDataItem) => {\n        return this.applyAttributeMapping(filter, record, bottomColor)[0];\n      });\n    }\n    layer.setEncodedData(\n      this.mapping(attributes, filterData, undefined, bottomColor),\n    );\n  }\n\n  private mapping(\n    attributes: IStyleAttribute[],\n    data: IParseDataItem[],\n    predata?: IEncodeFeature[],\n    minimumColor?: string,\n  ): IEncodeFeature[] {\n    // console.log('data', data)\n    const mappedData = data.map((record: IParseDataItem, i) => {\n      const preRecord = predata ? predata[i] : {};\n      const encodeRecord: IEncodeFeature = {\n        id: record._id,\n        coordinates: record.coordinates,\n        ...preRecord,\n      };\n      // console.log('attributes', attributes)\n      attributes\n        .filter((attribute) => attribute.scale !== undefined)\n        .forEach((attribute: IStyleAttribute) => {\n          // console.log('attribute', attribute)\n          // console.log('record', record)\n          let values = this.applyAttributeMapping(\n            attribute,\n            record,\n            minimumColor,\n          );\n          // console.log('values', values)\n          attribute.needRemapping = false;\n\n          // TODO: 支持每个属性配置 postprocess\n          if (attribute.name === 'color') {\n            // console.log('attribute', attribute)\n            values = values.map((c: unknown) => {\n              return rgb2arr(c as string);\n            });\n          }\n          // @ts-ignore\n          encodeRecord[attribute.name] =\n            Array.isArray(values) && values.length === 1 ? values[0] : values;\n\n          // 增加对 layer/text/iconfont unicode 映射的解析\n          if (attribute.name === 'shape') {\n            encodeRecord.shape = this.fontService.getIconFontKey(\n              encodeRecord[attribute.name] as string,\n            );\n          }\n        });\n      return encodeRecord;\n    }) as IEncodeFeature[];\n    // console.log('mappedData', mappedData)\n\n    // 调整数据兼容 Amap2.0\n    this.adjustData2Amap2Coordinates(mappedData);\n\n    // 调整数据兼容 SimpleCoordinates\n    this.adjustData2SimpleCoordinates(mappedData);\n    // console.log('mappedData', mappedData)\n    return mappedData;\n  }\n\n  private adjustData2Amap2Coordinates(mappedData: IEncodeFeature[]) {\n    // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移\n    if (\n      mappedData.length > 0 &&\n      this.mapService.version === Version['GAODE2.x']\n    ) {\n      if (typeof mappedData[0].coordinates[0] === 'number') {\n        // 单个的点数据\n        // @ts-ignore\n        mappedData\n          // TODO: 避免经纬度被重复计算导致坐标位置偏移\n          .filter((d) => !d.originCoordinates)\n          .map((d) => {\n            d.version = 'GAODE2.x';\n            // @ts-ignore\n            d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）\n            // @ts-ignore\n            d.coordinates = this.mapService.lngLatToCoord(d.coordinates);\n          });\n      } else {\n        // 连续的线、面数据\n        // @ts-ignore\n        mappedData\n          // TODO: 避免经纬度被重复计算导致坐标位置偏移\n          .filter((d) => !d.originCoordinates)\n          .map((d) => {\n            d.version = 'GAODE2.x';\n            // @ts-ignore\n            d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）\n            // @ts-ignore\n            d.coordinates = this.mapService.lngLatToCoords(d.coordinates);\n          });\n      }\n    }\n  }\n\n  private adjustData2SimpleCoordinates(mappedData: IEncodeFeature[]) {\n    if (mappedData.length > 0 && this.mapService.version === Version.SIMPLE) {\n      mappedData.map((d) => {\n        if (!d.simpleCoordinate) {\n          d.coordinates = this.unProjectCoordinates(d.coordinates);\n          d.simpleCoordinate = true;\n        }\n      });\n    }\n  }\n\n  private unProjectCoordinates(coordinates: any) {\n    if (typeof coordinates[0] === 'number') {\n      return this.mapService.simpleMapCoord.unproject(\n        coordinates as [number, number],\n      );\n    }\n\n    if (coordinates[0] && coordinates[0][0] instanceof Array) {\n      // @ts-ignore\n      const coords = [];\n      coordinates.map((coord: any) => {\n        // @ts-ignore\n        const c1 = [];\n        coord.map((co: any) => {\n          c1.push(\n            this.mapService.simpleMapCoord.unproject(co as [number, number]),\n          );\n        });\n        // @ts-ignore\n        coords.push(c1);\n      });\n      // @ts-ignore\n      return coords;\n    } else {\n      // @ts-ignore\n      const coords = [];\n      // @ts-ignore\n      coordinates.map((coord) => {\n        coords.push(\n          this.mapService.simpleMapCoord.unproject(coord as [number, number]),\n        );\n      });\n      // @ts-ignore\n      return coords;\n    }\n  }\n\n  private applyAttributeMapping(\n    attribute: IStyleAttribute,\n    record: { [key: string]: unknown },\n    minimumColor?: string,\n  ) {\n    if (!attribute.scale) {\n      return [];\n    }\n    const scalers = attribute?.scale?.scalers || [];\n    const params: unknown[] = [];\n\n    scalers.forEach(({ field }) => {\n      if (\n        record.hasOwnProperty(field) ||\n        attribute.scale?.type === 'variable'\n      ) {\n        // TODO:多字段，常量\n        params.push(record[field]);\n      }\n    });\n    // console.log('params', params)\n    // console.log('attribute', attribute)\n\n    const mappingResult = attribute.mapping ? attribute.mapping(params) : [];\n    if (attribute.name === 'color' && !isColor(mappingResult[0])) {\n      return [minimumColor];\n    }\n    return mappingResult;\n    // return attribute.mapping ? attribute.mapping(params) : [];\n  }\n}\n"],"file":"DataMappingPlugin.js"}

package/lib/canvas/models/canvas.js

@@ -46,7 +46,7 @@ var CanvaModel = function (_BaseModel) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateMode", _interface.CanvasUpdateType.AWAYS);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "updateMode", _interface.CanvasUpdateType.ALWAYS);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "canvas", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "ctx", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "prevSize", void 0);
@@ -55,7 +55,12 @@ var CanvaModel = function (_BaseModel) {
           _ref$zIndex = _ref.zIndex,
           zIndex = _ref$zIndex === void 0 ? 10 : _ref$zIndex,
           _ref$update = _ref.update,
-          update = _ref$update === void 0 ? _interface.CanvasUpdateType.AWAYS : _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 + '';
@@ -68,6 +73,10 @@ var CanvaModel = function (_BaseModel) {
 
         _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);
@@ -81,7 +90,7 @@ var CanvaModel = function (_BaseModel) {
       _this.mapService.off('moveend', _this.renderCanvas);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "bindListener", function () {
-      if (_this.updateMode === _interface.CanvasUpdateType.AWAYS) {
+      if (_this.updateMode === _interface.CanvasUpdateType.ALWAYS) {
         _this.mapService.on('mapchange', _this.renderCanvas);
       } else {
         _this.mapService.on('zoomstart', _this.clearCanvas);
@@ -152,7 +161,7 @@ var CanvaModel = function (_BaseModel) {
     value: function initModels() {
       var _ref3 = this.layer.getLayerConfig(),
           _ref3$update = _ref3.update,
-          update = _ref3$update === void 0 ? _interface.CanvasUpdateType.AWAYS : _ref3$update;
+          update = _ref3$update === void 0 ? _interface.CanvasUpdateType.ALWAYS : _ref3$update;
 
       this.updateMode = update;
       this.initCanvas();

package/lib/canvas/models/canvas.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/canvas/models/canvas.ts"],"names":["CanvaModel","CanvasUpdateType","AWAYS","layer","getLayerConfig","zIndex","update","canvas","style","updateMode","unBindListener","bindListener","mapService","off","renderCanvas","clearCanvas","on","ctx","rendererService","getViewportSize","w","width","h","height","clearRect","viewWidth","viewHeight","prevSize","size","getSize","drawingOnCanvas","document","removeChild","initCanvas","getContainer","createElement","pointerEvents","position","top","left","appendChild","getContext","initModels","BaseModel"],"mappings":"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","sourcesContent":["import BaseModel from '../../core/BaseModel';\nimport {\n  CanvasUpdateType,\n  ICanvasLayerStyleOptions,\n  IDrawingOnCanvas,\n} from '../../core/interface';\n\nexport default class CanvaModel extends BaseModel {\n  protected updateMode: CanvasUpdateType = CanvasUpdateType.AWAYS;\n  protected canvas: HTMLCanvasElement;\n  protected ctx: CanvasRenderingContext2D;\n  protected prevSize: [number, number];\n  public renderUpdate = () => {\n    const {\n      zIndex = 10,\n      update = CanvasUpdateType.AWAYS,\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    if (+this.canvas.style.zIndex === zIndex) {\n      this.canvas.style.zIndex = zIndex + '';\n    }\n    if (this.updateMode !== update) {\n      this.updateMode = update as CanvasUpdateType;\n      this.unBindListener();\n      this.bindListener();\n    }\n  };\n\n  public unBindListener = () => {\n    this.mapService.off('mapchange', this.renderCanvas);\n    this.mapService.off('zoomstart', this.clearCanvas);\n    this.mapService.off('zoomend', this.renderCanvas);\n    this.mapService.off('movestart', this.clearCanvas);\n    this.mapService.off('moveend', this.renderCanvas);\n  };\n\n  public bindListener = () => {\n    if (this.updateMode === CanvasUpdateType.AWAYS) {\n      this.mapService.on('mapchange', this.renderCanvas);\n    } else {\n      this.mapService.on('zoomstart', this.clearCanvas);\n      this.mapService.on('zoomend', this.renderCanvas);\n      this.mapService.on('movestart', this.clearCanvas);\n      this.mapService.on('moveend', this.renderCanvas);\n    }\n  };\n\n  public clearModels(): void {\n    if (this.canvas) {\n      document.removeChild(this.canvas);\n      // @ts-ignore\n      this.canvas = null;\n    }\n    this.unBindListener();\n  }\n\n  public initModels() {\n    const {\n      update = CanvasUpdateType.AWAYS,\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    this.updateMode = update as CanvasUpdateType;\n    this.initCanvas();\n\n    this.renderCanvas();\n\n    this.bindListener();\n\n    this.mapService.getContainer();\n    return [];\n  }\n\n  public initCanvas(): void {\n    const { zIndex } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    const size = this.mapService.getSize();\n    const [width, height] = size;\n    const {\n      width: viewWidth,\n      height: viewHeight,\n    } = this.rendererService.getViewportSize();\n    this.prevSize = [viewWidth, viewHeight];\n\n    const canvas = document.createElement('canvas');\n    this.canvas = canvas;\n    canvas.width = viewWidth;\n    canvas.height = viewHeight;\n    canvas.style.pointerEvents = 'none';\n    canvas.style.width = width + 'px';\n    canvas.style.height = height + 'px';\n    canvas.style.position = 'absolute';\n    canvas.style.top = '0';\n    canvas.style.left = '0';\n    canvas.style.zIndex = zIndex + '';\n    this.mapService.getContainer()?.appendChild(canvas);\n\n    const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;\n    this.ctx = ctx;\n  }\n\n  public clearCanvas = () => {\n    if (this.ctx) {\n      const { width: w, height: h } = this.rendererService.getViewportSize();\n      this.ctx.clearRect(0, 0, w, h);\n    }\n  };\n\n  public renderCanvas = () => {\n    const {\n      width: viewWidth,\n      height: viewHeight,\n    } = this.rendererService.getViewportSize();\n    if (this.prevSize[0] !== viewWidth || this.prevSize[1] !== viewHeight) {\n      this.prevSize = [viewWidth, viewHeight];\n      const size = this.mapService.getSize();\n      const [width, height] = size;\n      this.canvas.width = viewWidth;\n      this.canvas.height = viewHeight;\n      this.canvas.style.width = width + 'px';\n      this.canvas.style.height = height + 'px';\n    }\n\n    const {\n      drawingOnCanvas,\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n\n    if (this.ctx) {\n      drawingOnCanvas({\n        canvas: this.canvas,\n        ctx: this.ctx,\n        mapService: this.mapService,\n        size: [viewWidth, viewHeight],\n      });\n    }\n  };\n\n  public buildModels() {\n    return this.initModels();\n  }\n\n  protected registerBuiltinAttributes() {\n    return;\n  }\n}\n"],"file":"canvas.js"}
+{"version":3,"sources":["../../../src/canvas/models/canvas.ts"],"names":["CanvaModel","CanvasUpdateType","ALWAYS","layer","getLayerConfig","zIndex","update","animateOption","enable","duration","canvas","style","updateMode","unBindListener","bindListener","renderCanvas","mapService","off","clearCanvas","on","ctx","rendererService","getViewportSize","w","width","h","height","clearRect","viewWidth","viewHeight","prevSize","size","getSize","drawingOnCanvas","document","removeChild","initCanvas","getContainer","createElement","pointerEvents","position","top","left","appendChild","getContext","initModels","BaseModel"],"mappings":"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","sourcesContent":["import { IModelUniform } from '@antv/l7-core';\nimport BaseModel from '../../core/BaseModel';\nimport {\n  CanvasUpdateType,\n  ICanvasLayerStyleOptions,\n  IDrawingOnCanvas,\n} from '../../core/interface';\n\nexport default class CanvaModel extends BaseModel {\n  protected updateMode: CanvasUpdateType = CanvasUpdateType.ALWAYS;\n  protected canvas: HTMLCanvasElement;\n  protected ctx: CanvasRenderingContext2D;\n  protected prevSize: [number, number];\n\n  public renderUpdate = () => {\n    const {\n      zIndex = 10,\n      update = CanvasUpdateType.ALWAYS,\n      animateOption = { enable: false, duration: 20 },\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    if (+this.canvas.style.zIndex === zIndex) {\n      this.canvas.style.zIndex = zIndex + '';\n    }\n    if (this.updateMode !== update) {\n      this.updateMode = update as CanvasUpdateType;\n      this.unBindListener();\n      this.bindListener();\n    }\n    if (this.updateMode === CanvasUpdateType.ALWAYS && animateOption.enable) {\n      this.renderCanvas();\n    }\n  };\n\n  public unBindListener = () => {\n    this.mapService.off('mapchange', this.renderCanvas);\n    this.mapService.off('zoomstart', this.clearCanvas);\n    this.mapService.off('zoomend', this.renderCanvas);\n    this.mapService.off('movestart', this.clearCanvas);\n    this.mapService.off('moveend', this.renderCanvas);\n  };\n\n  public bindListener = () => {\n    if (this.updateMode === CanvasUpdateType.ALWAYS) {\n      this.mapService.on('mapchange', this.renderCanvas);\n    } else {\n      this.mapService.on('zoomstart', this.clearCanvas);\n      this.mapService.on('zoomend', this.renderCanvas);\n      this.mapService.on('movestart', this.clearCanvas);\n      this.mapService.on('moveend', this.renderCanvas);\n    }\n  };\n\n  public clearModels(): void {\n    if (this.canvas) {\n      document.removeChild(this.canvas);\n      // @ts-ignore\n      this.canvas = null;\n    }\n    this.unBindListener();\n  }\n\n  public initModels() {\n    const {\n      update = CanvasUpdateType.ALWAYS,\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    this.updateMode = update as CanvasUpdateType;\n    this.initCanvas();\n\n    this.renderCanvas();\n\n    this.bindListener();\n\n    this.mapService.getContainer();\n    return [];\n  }\n\n  public initCanvas(): void {\n    const { zIndex } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n    const size = this.mapService.getSize();\n    const [width, height] = size;\n    const {\n      width: viewWidth,\n      height: viewHeight,\n    } = this.rendererService.getViewportSize();\n    this.prevSize = [viewWidth, viewHeight];\n\n    const canvas = document.createElement('canvas');\n    this.canvas = canvas;\n    canvas.width = viewWidth;\n    canvas.height = viewHeight;\n    canvas.style.pointerEvents = 'none';\n    canvas.style.width = width + 'px';\n    canvas.style.height = height + 'px';\n    canvas.style.position = 'absolute';\n    canvas.style.top = '0';\n    canvas.style.left = '0';\n    canvas.style.zIndex = zIndex + '';\n    this.mapService.getContainer()?.appendChild(canvas);\n\n    const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;\n    this.ctx = ctx;\n  }\n\n  public clearCanvas = () => {\n    if (this.ctx) {\n      const { width: w, height: h } = this.rendererService.getViewportSize();\n      this.ctx.clearRect(0, 0, w, h);\n    }\n  };\n\n  public renderCanvas = () => {\n    const {\n      width: viewWidth,\n      height: viewHeight,\n    } = this.rendererService.getViewportSize();\n    if (this.prevSize[0] !== viewWidth || this.prevSize[1] !== viewHeight) {\n      this.prevSize = [viewWidth, viewHeight];\n      const size = this.mapService.getSize();\n      const [width, height] = size;\n      this.canvas.width = viewWidth;\n      this.canvas.height = viewHeight;\n      this.canvas.style.width = width + 'px';\n      this.canvas.style.height = height + 'px';\n    }\n\n    const {\n      drawingOnCanvas,\n    } = this.layer.getLayerConfig() as ICanvasLayerStyleOptions;\n\n    if (this.ctx) {\n      drawingOnCanvas({\n        canvas: this.canvas,\n        ctx: this.ctx,\n        mapService: this.mapService,\n        size: [viewWidth, viewHeight],\n      });\n    }\n  };\n\n  public buildModels() {\n    return this.initModels();\n  }\n\n  protected registerBuiltinAttributes() {\n    return;\n  }\n}\n"],"file":"canvas.js"}

package/lib/core/interface.js

@@ -16,7 +16,7 @@ var CanvasUpdateType;
 exports.CanvasUpdateType = CanvasUpdateType;
 
 (function (CanvasUpdateType) {
-  CanvasUpdateType["AWAYS"] = "aways";
+  CanvasUpdateType["ALWAYS"] = "always";
   CanvasUpdateType["DRAGEND"] = "dragend";
 })(CanvasUpdateType || (exports.CanvasUpdateType = CanvasUpdateType = {}));
 //# sourceMappingURL=interface.js.map

package/lib/core/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/core/interface.ts"],"names":["lineStyleType","CanvasUpdateType"],"mappings":";;;;;;IASYA,a;;;WAAAA,a;AAAAA,EAAAA,a,CAAAA,a;AAAAA,EAAAA,a,CAAAA,a;GAAAA,a,6BAAAA,a;;IAmHAC,gB;;;WAAAA,gB;AAAAA,EAAAA,gB;AAAAA,EAAAA,gB;GAAAA,gB,gCAAAA,gB","sourcesContent":["import { IAnimateOption, IMapService } from '@antv/l7-core';\nimport { generateColorRamp, getMask, IColorRamp } from '@antv/l7-utils';\nimport { styleColor, styleOffset, styleSingle } from '../core/BaseModel';\nimport {\n  anchorType,\n  getGlyphQuads,\n  IGlyphQuad,\n  shapeText,\n} from '../utils/symbol-layout';\nexport enum lineStyleType {\n  'solid' = 0.0,\n  'dash' = 1.0,\n}\n\nexport interface ILineLayerStyleOptions {\n  opacity: styleSingle;\n  lineType?: keyof typeof lineStyleType; // 可选参数、线类型(all - dash/solid)\n  dashArray?: [number, number]; //  可选参数、虚线间隔\n  segmentNumber?: number;\n\n  forward?: boolean; // 可选参数、是否反向(arcLine)\n  lineTexture?: boolean; // 可选参数、是否开启纹理贴图功能(all)\n  iconStep?: number; // 可选参数、纹理贴图步长(all)\n  iconStepCount?: number; // 可选参数、纹理贴图间隔\n  textureBlend?: string; // 可选参数、供给纹理贴图使用(all)\n  sourceColor?: string; // 可选参数、设置渐变色的起始颜色(all)\n  targetColor?: string; // 可选参数、设置渐变色的终点颜色(all)\n  thetaOffset?: number; // 可选参数、设置弧线的偏移量\n\n  globalArcHeight?: number; // 可选参数、地球模式下 3D 弧线的高度\n  vertexHeightScale?: number; // 可选参数、lineLayer vertex height scale\n\n  borderWidth?: number; // 可选参数 线边框宽度\n  borderColor?: string; // 可选参数 线边框颜色\n\n  heightfixed?: boolean; // 可选参数 高度是否固定\n\n  mask?: boolean; // 可选参数 时候允许蒙层\n  maskInside?: boolean; // 可选参数 控制图层是否显示在蒙层的内部\n}\n\nexport interface IPointLayerStyleOptions {\n  opacity: number;\n  strokeOpacity: number;\n  strokeWidth: number;\n  stroke: string;\n\n  textOffset?: [number, number];\n  textAnchor?: anchorType;\n  spacing?: number;\n  padding?: [number, number];\n  halo?: number;\n  gamma?: number;\n  fontWeight?: string;\n  fontFamily?: string;\n  textAllowOverlap?: boolean;\n\n  // cylinder\n  pickLight?: boolean;\n  depth?: boolean;\n  sourceColor?: string; // 可选参数、设置渐变色的起始颜色(all)\n  targetColor?: string; // 可选参数、设置渐变色的终点颜色(all)\n  opacityLinear?: {\n    enable: boolean;\n    dir: string;\n  };\n  lightEnable: boolean;\n  heightfixed?: boolean; // 圆柱体高度是否固定（不随 zoom 发生变化）\n\n  offsets?: styleOffset;\n  blend?: string;\n  unit?: string;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  rotation?: number; // angle\n  speed?: number;\n  animateOption: IAnimateOption;\n}\n\nexport interface IPolygonLayerStyleOptions {\n  opacity: styleSingle;\n\n  opacityLinear: {\n    enable: boolean;\n    dir: string;\n  };\n\n  heightfixed?: boolean; // 挤出几何体高度是否固定（不随 zoom 发生变化）\n\n  pickLight: boolean;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  // water\n  waterTexture?: string;\n  speed?: number;\n  // ocean\n  watercolor?: string;\n  watercolor2?: string;\n}\n\nexport interface IImageLayerStyleOptions {\n  opacity: number;\n  mask?: boolean;\n  maskInside?: boolean;\n}\n\nexport interface IGeometryLayerStyleOptions {\n  opacity: number;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  mapTexture?: string;\n\n  // planeGeometry\n  center?: [number, number];\n  width?: number;\n  height?: number;\n\n  widthSegments?: number;\n  heightSegments?: number;\n}\n\nexport enum CanvasUpdateType {\n  'AWAYS' = 'aways',\n  'DRAGEND' = 'dragend',\n}\n\nexport interface IDrawingOnCanvas {\n  canvas: HTMLCanvasElement;\n  ctx: CanvasRenderingContext2D;\n  mapService: IMapService;\n  size: [number, number];\n}\nexport interface ICanvasLayerStyleOptions {\n  zIndex: number;\n  update: CanvasUpdateType | string;\n  drawingOnCanvas: (option: IDrawingOnCanvas) => void;\n}\n\nexport interface IHeatMapLayerStyleOptions {\n  opacity: number;\n  intensity: number;\n  radius: number;\n  angle: number;\n  rampColors: IColorRamp;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  coverage?: number;\n}\n\nexport interface IRasterLayerStyleOptions {\n  opacity: number;\n  domain: [number, number];\n  noDataValue: number;\n  clampLow: boolean;\n  clampHigh: boolean;\n  rampColors: IColorRamp;\n  mask?: boolean;\n  maskInside?: boolean;\n}\n"],"file":"interface.js"}
+{"version":3,"sources":["../../src/core/interface.ts"],"names":["lineStyleType","CanvasUpdateType"],"mappings":";;;;;;IASYA,a;;;WAAAA,a;AAAAA,EAAAA,a,CAAAA,a;AAAAA,EAAAA,a,CAAAA,a;GAAAA,a,6BAAAA,a;;IAmHAC,gB;;;WAAAA,gB;AAAAA,EAAAA,gB;AAAAA,EAAAA,gB;GAAAA,gB,gCAAAA,gB","sourcesContent":["import { IAnimateOption, IMapService } from '@antv/l7-core';\nimport { generateColorRamp, getMask, IColorRamp } from '@antv/l7-utils';\nimport { styleColor, styleOffset, styleSingle } from '../core/BaseModel';\nimport {\n  anchorType,\n  getGlyphQuads,\n  IGlyphQuad,\n  shapeText,\n} from '../utils/symbol-layout';\nexport enum lineStyleType {\n  'solid' = 0.0,\n  'dash' = 1.0,\n}\n\nexport interface ILineLayerStyleOptions {\n  opacity: styleSingle;\n  lineType?: keyof typeof lineStyleType; // 可选参数、线类型(all - dash/solid)\n  dashArray?: [number, number]; //  可选参数、虚线间隔\n  segmentNumber?: number;\n\n  forward?: boolean; // 可选参数、是否反向(arcLine)\n  lineTexture?: boolean; // 可选参数、是否开启纹理贴图功能(all)\n  iconStep?: number; // 可选参数、纹理贴图步长(all)\n  iconStepCount?: number; // 可选参数、纹理贴图间隔\n  textureBlend?: string; // 可选参数、供给纹理贴图使用(all)\n  sourceColor?: string; // 可选参数、设置渐变色的起始颜色(all)\n  targetColor?: string; // 可选参数、设置渐变色的终点颜色(all)\n  thetaOffset?: number; // 可选参数、设置弧线的偏移量\n\n  globalArcHeight?: number; // 可选参数、地球模式下 3D 弧线的高度\n  vertexHeightScale?: number; // 可选参数、lineLayer vertex height scale\n\n  borderWidth?: number; // 可选参数 线边框宽度\n  borderColor?: string; // 可选参数 线边框颜色\n\n  heightfixed?: boolean; // 可选参数 高度是否固定\n\n  mask?: boolean; // 可选参数 时候允许蒙层\n  maskInside?: boolean; // 可选参数 控制图层是否显示在蒙层的内部\n}\n\nexport interface IPointLayerStyleOptions {\n  opacity: number;\n  strokeOpacity: number;\n  strokeWidth: number;\n  stroke: string;\n\n  textOffset?: [number, number];\n  textAnchor?: anchorType;\n  spacing?: number;\n  padding?: [number, number];\n  halo?: number;\n  gamma?: number;\n  fontWeight?: string;\n  fontFamily?: string;\n  textAllowOverlap?: boolean;\n\n  // cylinder\n  pickLight?: boolean;\n  depth?: boolean;\n  sourceColor?: string; // 可选参数、设置渐变色的起始颜色(all)\n  targetColor?: string; // 可选参数、设置渐变色的终点颜色(all)\n  opacityLinear?: {\n    enable: boolean;\n    dir: string;\n  };\n  lightEnable: boolean;\n  heightfixed?: boolean; // 圆柱体高度是否固定（不随 zoom 发生变化）\n\n  offsets?: styleOffset;\n  blend?: string;\n  unit?: string;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  rotation?: number; // angle\n  speed?: number;\n  animateOption: IAnimateOption;\n}\n\nexport interface IPolygonLayerStyleOptions {\n  opacity: styleSingle;\n\n  opacityLinear: {\n    enable: boolean;\n    dir: string;\n  };\n\n  heightfixed?: boolean; // 挤出几何体高度是否固定（不随 zoom 发生变化）\n\n  pickLight: boolean;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  // water\n  waterTexture?: string;\n  speed?: number;\n  // ocean\n  watercolor?: string;\n  watercolor2?: string;\n}\n\nexport interface IImageLayerStyleOptions {\n  opacity: number;\n  mask?: boolean;\n  maskInside?: boolean;\n}\n\nexport interface IGeometryLayerStyleOptions {\n  opacity: number;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  mapTexture?: string;\n\n  // planeGeometry\n  center?: [number, number];\n  width?: number;\n  height?: number;\n\n  widthSegments?: number;\n  heightSegments?: number;\n}\n\nexport enum CanvasUpdateType {\n  'ALWAYS' = 'always',\n  'DRAGEND' = 'dragend',\n}\n\nexport interface IDrawingOnCanvas {\n  canvas: HTMLCanvasElement;\n  ctx: CanvasRenderingContext2D;\n  mapService: IMapService;\n  size: [number, number];\n}\nexport interface ICanvasLayerStyleOptions {\n  zIndex: number;\n  update: CanvasUpdateType | string;\n  drawingOnCanvas: (option: IDrawingOnCanvas) => void;\n  animateOption: IAnimateOption;\n}\n\nexport interface IHeatMapLayerStyleOptions {\n  opacity: number;\n  intensity: number;\n  radius: number;\n  angle: number;\n  rampColors: IColorRamp;\n  mask?: boolean;\n  maskInside?: boolean;\n\n  coverage?: number;\n}\n\nexport interface IRasterLayerStyleOptions {\n  opacity: number;\n  domain: [number, number];\n  noDataValue: number;\n  clampLow: boolean;\n  clampHigh: boolean;\n  rampColors: IColorRamp;\n  mask?: boolean;\n  maskInside?: boolean;\n}\n"],"file":"interface.js"}

package/lib/plugins/DataMappingPlugin.js

@@ -23,6 +23,8 @@ var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var _l7Core = require("@antv/l7-core");
 
+var _l7Maps = require("@antv/l7-maps");
+
 var _l7Utils = require("@antv/l7-utils");
 
 var _inversify = require("inversify");
@@ -149,15 +151,23 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
         });
         return encodeRecord;
       });
+      this.adjustData2Amap2Coordinates(mappedData);
+      this.adjustData2SimpleCoordinates(mappedData);
+      return mappedData;
+    }
+  }, {
+    key: "adjustData2Amap2Coordinates",
+    value: function adjustData2Amap2Coordinates(mappedData) {
+      var _this4 = this;
 
-      if (mappedData.length > 0 && this.mapService.version === 'GAODE2.x') {
+      if (mappedData.length > 0 && this.mapService.version === _l7Maps.Version['GAODE2.x']) {
         if (typeof mappedData[0].coordinates[0] === 'number') {
           mappedData.filter(function (d) {
             return !d.originCoordinates;
           }).map(function (d) {
             d.version = 'GAODE2.x';
             d.originCoordinates = (0, _cloneDeep2.default)(d.coordinates);
-            d.coordinates = _this3.mapService.lngLatToCoord(d.coordinates);
+            d.coordinates = _this4.mapService.lngLatToCoord(d.coordinates);
           });
         } else {
           mappedData.filter(function (d) {
@@ -165,12 +175,51 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
           }).map(function (d) {
             d.version = 'GAODE2.x';
             d.originCoordinates = (0, _cloneDeep2.default)(d.coordinates);
-            d.coordinates = _this3.mapService.lngLatToCoords(d.coordinates);
+            d.coordinates = _this4.mapService.lngLatToCoords(d.coordinates);
           });
         }
       }
+    }
+  }, {
+    key: "adjustData2SimpleCoordinates",
+    value: function adjustData2SimpleCoordinates(mappedData) {
+      var _this5 = this;
+
+      if (mappedData.length > 0 && this.mapService.version === _l7Maps.Version.SIMPLE) {
+        mappedData.map(function (d) {
+          if (!d.simpleCoordinate) {
+            d.coordinates = _this5.unProjectCoordinates(d.coordinates);
+            d.simpleCoordinate = true;
+          }
+        });
+      }
+    }
+  }, {
+    key: "unProjectCoordinates",
+    value: function unProjectCoordinates(coordinates) {
+      var _this6 = this;
 
-      return mappedData;
+      if (typeof coordinates[0] === 'number') {
+        return this.mapService.simpleMapCoord.unproject(coordinates);
+      }
+
+      if (coordinates[0] && coordinates[0][0] instanceof Array) {
+        var coords = [];
+        coordinates.map(function (coord) {
+          var c1 = [];
+          coord.map(function (co) {
+            c1.push(_this6.mapService.simpleMapCoord.unproject(co));
+          });
+          coords.push(c1);
+        });
+        return coords;
+      } else {
+        var _coords = [];
+        coordinates.map(function (coord) {
+          _coords.push(_this6.mapService.simpleMapCoord.unproject(coord));
+        });
+        return _coords;
+      }
     }
   }, {
     key: "applyAttributeMapping",

package/lib/plugins/DataMappingPlugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/DataMappingPlugin.ts"],"names":["DataMappingPlugin","TYPES","IGlobalConfigService","IMapService","IFontService","layer","styleAttributeService","hooks","init","tap","generateMaping","beforeRenderData","dataState","dataMappingNeedUpdate","beforeRender","layerModelNeedUpdate","bottomColor","getBottomColor","attributes","getLayerStyleAttributes","filter","getLayerStyleAttribute","dataArray","getSource","data","attributesToRemapping","attribute","needRemapping","filterData","scale","record","applyAttributeMapping","length","setEncodedData","mapping","undefined","getEncodedData","emit","predata","minimumColor","mappedData","map","i","preRecord","encodeRecord","id","_id","coordinates","forEach","values","name","c","Array","isArray","shape","fontService","getIconFontKey","mapService","version","d","originCoordinates","lngLatToCoord","lngLatToCoords","scalers","params","field","hasOwnProperty","type","push","mappingResult"],"mappings":"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","sourcesContent":["import {\n  IEncodeFeature,\n  IFontService,\n  IGlobalConfigService,\n  ILayer,\n  ILayerPlugin,\n  ILngLat,\n  IMapService,\n  IParseDataItem,\n  IStyleAttribute,\n  IStyleAttributeService,\n  TYPES,\n} from '@antv/l7-core';\nimport { isColor, rgb2arr, unProjectFlat } from '@antv/l7-utils';\nimport { inject, injectable } from 'inversify';\nimport { cloneDeep } from 'lodash';\nimport 'reflect-metadata';\n\n@injectable()\nexport default class DataMappingPlugin implements ILayerPlugin {\n  @inject(TYPES.IGlobalConfigService)\n  private readonly configService: IGlobalConfigService;\n\n  @inject(TYPES.IMapService)\n  private readonly mapService: IMapService;\n\n  @inject(TYPES.IFontService)\n  private readonly fontService: IFontService;\n\n  public apply(\n    layer: ILayer,\n    {\n      styleAttributeService,\n    }: { styleAttributeService: IStyleAttributeService },\n  ) {\n    layer.hooks.init.tap('DataMappingPlugin', () => {\n      // 初始化重新生成 map\n      this.generateMaping(layer, { styleAttributeService });\n    });\n\n    layer.hooks.beforeRenderData.tap('DataMappingPlugin', () => {\n      layer.dataState.dataMappingNeedUpdate = false;\n      this.generateMaping(layer, { styleAttributeService });\n      return true;\n    });\n\n    // remapping before render\n    layer.hooks.beforeRender.tap('DataMappingPlugin', () => {\n      if (layer.layerModelNeedUpdate) {\n        return;\n      }\n      const bottomColor = layer.getBottomColor();\n      const attributes = styleAttributeService.getLayerStyleAttributes() || [];\n      const filter = styleAttributeService.getLayerStyleAttribute('filter');\n      const { dataArray } = layer.getSource().data;\n      const attributesToRemapping = attributes.filter(\n        (attribute) => attribute.needRemapping, // 如果filter变化\n      );\n      let filterData = dataArray;\n      // 数据过滤完 再执行数据映射\n      if (filter?.needRemapping && filter?.scale) {\n        filterData = dataArray.filter((record: IParseDataItem) => {\n          return this.applyAttributeMapping(filter, record, bottomColor)[0];\n        });\n      }\n      if (attributesToRemapping.length) {\n        // 过滤数据\n        if (filter?.needRemapping) {\n          layer.setEncodedData(\n            this.mapping(attributes, filterData, undefined, bottomColor),\n          );\n          filter.needRemapping = false;\n        } else {\n          layer.setEncodedData(\n            this.mapping(\n              attributesToRemapping,\n              filterData,\n              layer.getEncodedData(),\n              bottomColor,\n            ),\n          );\n        }\n        // 处理文本更新\n        layer.emit('remapping', null);\n      }\n    });\n  }\n  private generateMaping(\n    layer: ILayer,\n    {\n      styleAttributeService,\n    }: { styleAttributeService: IStyleAttributeService },\n  ) {\n    const bottomColor = layer.getBottomColor();\n    const attributes = styleAttributeService.getLayerStyleAttributes() || [];\n    const filter = styleAttributeService.getLayerStyleAttribute('filter');\n    const { dataArray } = layer.getSource().data;\n    let filterData = dataArray;\n    // 数据过滤完 再执行数据映射\n    if (filter?.scale) {\n      filterData = dataArray.filter((record: IParseDataItem) => {\n        return this.applyAttributeMapping(filter, record, bottomColor)[0];\n      });\n    }\n    layer.setEncodedData(\n      this.mapping(attributes, filterData, undefined, bottomColor),\n    );\n  }\n\n  private mapping(\n    attributes: IStyleAttribute[],\n    data: IParseDataItem[],\n    predata?: IEncodeFeature[],\n    minimumColor?: string,\n  ): IEncodeFeature[] {\n    // console.log('data', data)\n    const mappedData = data.map((record: IParseDataItem, i) => {\n      const preRecord = predata ? predata[i] : {};\n      const encodeRecord: IEncodeFeature = {\n        id: record._id,\n        coordinates: record.coordinates,\n        ...preRecord,\n      };\n      // console.log('attributes', attributes)\n      attributes\n        .filter((attribute) => attribute.scale !== undefined)\n        .forEach((attribute: IStyleAttribute) => {\n          // console.log('attribute', attribute)\n          // console.log('record', record)\n          let values = this.applyAttributeMapping(\n            attribute,\n            record,\n            minimumColor,\n          );\n          // console.log('values', values)\n          attribute.needRemapping = false;\n\n          // TODO: 支持每个属性配置 postprocess\n          if (attribute.name === 'color') {\n            // console.log('attribute', attribute)\n            values = values.map((c: unknown) => {\n              return rgb2arr(c as string);\n            });\n          }\n          // @ts-ignore\n          encodeRecord[attribute.name] =\n            Array.isArray(values) && values.length === 1 ? values[0] : values;\n\n          // 增加对 layer/text/iconfont unicode 映射的解析\n          if (attribute.name === 'shape') {\n            encodeRecord.shape = this.fontService.getIconFontKey(\n              encodeRecord[attribute.name] as string,\n            );\n          }\n        });\n      return encodeRecord;\n    }) as IEncodeFeature[];\n    // console.log('mappedData', mappedData)\n\n    // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移\n    if (mappedData.length > 0 && this.mapService.version === 'GAODE2.x') {\n      if (typeof mappedData[0].coordinates[0] === 'number') {\n        // 单个的点数据\n        // @ts-ignore\n        mappedData\n          // TODO: 避免经纬度被重复计算导致坐标位置偏移\n          .filter((d) => !d.originCoordinates)\n          .map((d) => {\n            d.version = 'GAODE2.x';\n            // @ts-ignore\n            d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）\n            // @ts-ignore\n            d.coordinates = this.mapService.lngLatToCoord(d.coordinates);\n            // d.coordinates = this.mapService.lngLatToCoord(unProjectFlat(d.coordinates));\n          });\n      } else {\n        // 连续的线、面数据\n        // @ts-ignore\n        mappedData\n          // TODO: 避免经纬度被重复计算导致坐标位置偏移\n          .filter((d) => !d.originCoordinates)\n          .map((d) => {\n            d.version = 'GAODE2.x';\n            // @ts-ignore\n            d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）\n            // @ts-ignore\n            d.coordinates = this.mapService.lngLatToCoords(d.coordinates);\n          });\n      }\n    }\n    // console.log('mappedData', mappedData)\n    return mappedData;\n  }\n\n  private applyAttributeMapping(\n    attribute: IStyleAttribute,\n    record: { [key: string]: unknown },\n    minimumColor?: string,\n  ) {\n    if (!attribute.scale) {\n      return [];\n    }\n    const scalers = attribute?.scale?.scalers || [];\n    const params: unknown[] = [];\n\n    scalers.forEach(({ field }) => {\n      if (\n        record.hasOwnProperty(field) ||\n        attribute.scale?.type === 'variable'\n      ) {\n        // TODO:多字段，常量\n        params.push(record[field]);\n      }\n    });\n    // console.log('params', params)\n    // console.log('attribute', attribute)\n\n    const mappingResult = attribute.mapping ? attribute.mapping(params) : [];\n    if (attribute.name === 'color' && !isColor(mappingResult[0])) {\n      return [minimumColor];\n    }\n    return mappingResult;\n    // return attribute.mapping ? attribute.mapping(params) : [];\n  }\n}\n"],"file":"DataMappingPlugin.js"}
+{"version":3,"sources":["../../src/plugins/DataMappingPlugin.ts"],"names":["DataMappingPlugin","TYPES","IGlobalConfigService","IMapService","IFontService","layer","styleAttributeService","hooks","init","tap","generateMaping","beforeRenderData","dataState","dataMappingNeedUpdate","beforeRender","layerModelNeedUpdate","bottomColor","getBottomColor","attributes","getLayerStyleAttributes","filter","getLayerStyleAttribute","dataArray","getSource","data","attributesToRemapping","attribute","needRemapping","filterData","scale","record","applyAttributeMapping","length","setEncodedData","mapping","undefined","getEncodedData","emit","predata","minimumColor","mappedData","map","i","preRecord","encodeRecord","id","_id","coordinates","forEach","values","name","c","Array","isArray","shape","fontService","getIconFontKey","adjustData2Amap2Coordinates","adjustData2SimpleCoordinates","mapService","version","Version","d","originCoordinates","lngLatToCoord","lngLatToCoords","SIMPLE","simpleCoordinate","unProjectCoordinates","simpleMapCoord","unproject","coords","coord","c1","co","push","scalers","params","field","hasOwnProperty","type","mappingResult"],"mappings":"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","sourcesContent":["import {\n  IEncodeFeature,\n  IFontService,\n  IGlobalConfigService,\n  ILayer,\n  ILayerPlugin,\n  ILngLat,\n  IMapService,\n  IParseDataItem,\n  IStyleAttribute,\n  IStyleAttributeService,\n  TYPES,\n} from '@antv/l7-core';\nimport { Version } from '@antv/l7-maps';\nimport { isColor, rgb2arr, unProjectFlat } from '@antv/l7-utils';\nimport { inject, injectable } from 'inversify';\nimport { cloneDeep } from 'lodash';\nimport 'reflect-metadata';\n\n@injectable()\nexport default class DataMappingPlugin implements ILayerPlugin {\n  @inject(TYPES.IGlobalConfigService)\n  private readonly configService: IGlobalConfigService;\n\n  @inject(TYPES.IMapService)\n  private readonly mapService: IMapService;\n\n  @inject(TYPES.IFontService)\n  private readonly fontService: IFontService;\n\n  public apply(\n    layer: ILayer,\n    {\n      styleAttributeService,\n    }: { styleAttributeService: IStyleAttributeService },\n  ) {\n    layer.hooks.init.tap('DataMappingPlugin', () => {\n      // 初始化重新生成 map\n      this.generateMaping(layer, { styleAttributeService });\n    });\n\n    layer.hooks.beforeRenderData.tap('DataMappingPlugin', () => {\n      layer.dataState.dataMappingNeedUpdate = false;\n      this.generateMaping(layer, { styleAttributeService });\n      return true;\n    });\n\n    // remapping before render\n    layer.hooks.beforeRender.tap('DataMappingPlugin', () => {\n      if (layer.layerModelNeedUpdate) {\n        return;\n      }\n      const bottomColor = layer.getBottomColor();\n      const attributes = styleAttributeService.getLayerStyleAttributes() || [];\n      const filter = styleAttributeService.getLayerStyleAttribute('filter');\n      const { dataArray } = layer.getSource().data;\n      const attributesToRemapping = attributes.filter(\n        (attribute) => attribute.needRemapping, // 如果filter变化\n      );\n      let filterData = dataArray;\n      // 数据过滤完 再执行数据映射\n      if (filter?.needRemapping && filter?.scale) {\n        filterData = dataArray.filter((record: IParseDataItem) => {\n          return this.applyAttributeMapping(filter, record, bottomColor)[0];\n        });\n      }\n      if (attributesToRemapping.length) {\n        // 过滤数据\n        if (filter?.needRemapping) {\n          layer.setEncodedData(\n            this.mapping(attributes, filterData, undefined, bottomColor),\n          );\n          filter.needRemapping = false;\n        } else {\n          layer.setEncodedData(\n            this.mapping(\n              attributesToRemapping,\n              filterData,\n              layer.getEncodedData(),\n              bottomColor,\n            ),\n          );\n        }\n        // 处理文本更新\n        layer.emit('remapping', null);\n      }\n    });\n  }\n  private generateMaping(\n    layer: ILayer,\n    {\n      styleAttributeService,\n    }: { styleAttributeService: IStyleAttributeService },\n  ) {\n    const bottomColor = layer.getBottomColor();\n    const attributes = styleAttributeService.getLayerStyleAttributes() || [];\n    const filter = styleAttributeService.getLayerStyleAttribute('filter');\n    const { dataArray } = layer.getSource().data;\n    let filterData = dataArray;\n    // 数据过滤完 再执行数据映射\n    if (filter?.scale) {\n      filterData = dataArray.filter((record: IParseDataItem) => {\n        return this.applyAttributeMapping(filter, record, bottomColor)[0];\n      });\n    }\n    layer.setEncodedData(\n      this.mapping(attributes, filterData, undefined, bottomColor),\n    );\n  }\n\n  private mapping(\n    attributes: IStyleAttribute[],\n    data: IParseDataItem[],\n    predata?: IEncodeFeature[],\n    minimumColor?: string,\n  ): IEncodeFeature[] {\n    // console.log('data', data)\n    const mappedData = data.map((record: IParseDataItem, i) => {\n      const preRecord = predata ? predata[i] : {};\n      const encodeRecord: IEncodeFeature = {\n        id: record._id,\n        coordinates: record.coordinates,\n        ...preRecord,\n      };\n      // console.log('attributes', attributes)\n      attributes\n        .filter((attribute) => attribute.scale !== undefined)\n        .forEach((attribute: IStyleAttribute) => {\n          // console.log('attribute', attribute)\n          // console.log('record', record)\n          let values = this.applyAttributeMapping(\n            attribute,\n            record,\n            minimumColor,\n          );\n          // console.log('values', values)\n          attribute.needRemapping = false;\n\n          // TODO: 支持每个属性配置 postprocess\n          if (attribute.name === 'color') {\n            // console.log('attribute', attribute)\n            values = values.map((c: unknown) => {\n              return rgb2arr(c as string);\n            });\n          }\n          // @ts-ignore\n          encodeRecord[attribute.name] =\n            Array.isArray(values) && values.length === 1 ? values[0] : values;\n\n          // 增加对 layer/text/iconfont unicode 映射的解析\n          if (attribute.name === 'shape') {\n            encodeRecord.shape = this.fontService.getIconFontKey(\n              encodeRecord[attribute.name] as string,\n            );\n          }\n        });\n      return encodeRecord;\n    }) as IEncodeFeature[];\n    // console.log('mappedData', mappedData)\n\n    // 调整数据兼容 Amap2.0\n    this.adjustData2Amap2Coordinates(mappedData);\n\n    // 调整数据兼容 SimpleCoordinates\n    this.adjustData2SimpleCoordinates(mappedData);\n    // console.log('mappedData', mappedData)\n    return mappedData;\n  }\n\n  private adjustData2Amap2Coordinates(mappedData: IEncodeFeature[]) {\n    // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移\n    if (\n      mappedData.length > 0 &&\n      this.mapService.version === Version['GAODE2.x']\n    ) {\n      if (typeof mappedData[0].coordinates[0] === 'number') {\n        // 单个的点数据\n        // @ts-ignore\n        mappedData\n          // TODO: 避免经纬度被重复计算导致坐标位置偏移\n          .filter((d) => !d.originCoordinates)\n          .map((d) => {\n            d.version = 'GAODE2.x';\n            // @ts-ignore\n            d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）\n            // @ts-ignore\n            d.coordinates = this.mapService.lngLatToCoord(d.coordinates);\n          });\n      } else {\n        // 连续的线、面数据\n        // @ts-ignore\n        mappedData\n          // TODO: 避免经纬度被重复计算导致坐标位置偏移\n          .filter((d) => !d.originCoordinates)\n          .map((d) => {\n            d.version = 'GAODE2.x';\n            // @ts-ignore\n            d.originCoordinates = cloneDeep(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）\n            // @ts-ignore\n            d.coordinates = this.mapService.lngLatToCoords(d.coordinates);\n          });\n      }\n    }\n  }\n\n  private adjustData2SimpleCoordinates(mappedData: IEncodeFeature[]) {\n    if (mappedData.length > 0 && this.mapService.version === Version.SIMPLE) {\n      mappedData.map((d) => {\n        if (!d.simpleCoordinate) {\n          d.coordinates = this.unProjectCoordinates(d.coordinates);\n          d.simpleCoordinate = true;\n        }\n      });\n    }\n  }\n\n  private unProjectCoordinates(coordinates: any) {\n    if (typeof coordinates[0] === 'number') {\n      return this.mapService.simpleMapCoord.unproject(\n        coordinates as [number, number],\n      );\n    }\n\n    if (coordinates[0] && coordinates[0][0] instanceof Array) {\n      // @ts-ignore\n      const coords = [];\n      coordinates.map((coord: any) => {\n        // @ts-ignore\n        const c1 = [];\n        coord.map((co: any) => {\n          c1.push(\n            this.mapService.simpleMapCoord.unproject(co as [number, number]),\n          );\n        });\n        // @ts-ignore\n        coords.push(c1);\n      });\n      // @ts-ignore\n      return coords;\n    } else {\n      // @ts-ignore\n      const coords = [];\n      // @ts-ignore\n      coordinates.map((coord) => {\n        coords.push(\n          this.mapService.simpleMapCoord.unproject(coord as [number, number]),\n        );\n      });\n      // @ts-ignore\n      return coords;\n    }\n  }\n\n  private applyAttributeMapping(\n    attribute: IStyleAttribute,\n    record: { [key: string]: unknown },\n    minimumColor?: string,\n  ) {\n    if (!attribute.scale) {\n      return [];\n    }\n    const scalers = attribute?.scale?.scalers || [];\n    const params: unknown[] = [];\n\n    scalers.forEach(({ field }) => {\n      if (\n        record.hasOwnProperty(field) ||\n        attribute.scale?.type === 'variable'\n      ) {\n        // TODO:多字段，常量\n        params.push(record[field]);\n      }\n    });\n    // console.log('params', params)\n    // console.log('attribute', attribute)\n\n    const mappingResult = attribute.mapping ? attribute.mapping(params) : [];\n    if (attribute.name === 'color' && !isColor(mappingResult[0])) {\n      return [minimumColor];\n    }\n    return mappingResult;\n    // return attribute.mapping ? attribute.mapping(params) : [];\n  }\n}\n"],"file":"DataMappingPlugin.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.8.7",
+  "version": "2.8.10",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -24,9 +24,9 @@
   "license": "ISC",
   "dependencies": {
     "@antv/geo-coord": "^1.0.8",
-    "@antv/l7-core": "^2.8.7",
-    "@antv/l7-source": "^2.8.7",
-    "@antv/l7-utils": "^2.8.7",
+    "@antv/l7-core": "^2.8.10",
+    "@antv/l7-source": "^2.8.10",
+    "@antv/l7-utils": "^2.8.10",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/meta": "^6.0.2",
@@ -52,7 +52,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "257aaad56dd95e2a6977086e05645560bc311e99",
+  "gitHead": "2b914b30d54ff9a80a268cdbcdef215d2934d6d5",
   "publishConfig": {
     "access": "public"
   }