@antv/l7-layers 2.8.32 → 2.8.33

package/es/point/models/simplePoint.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/point/models/simplePoint.ts"],"names":["AttributeType","BlendType","gl","getMask","BaseModel","PointTriangulation","feature","coordinates","vertices","indices","size","length","SimplePointModel","blend","layer","getLayerConfig","opacity","offsets","strokeOpacity","strokeWidth","stroke","dataTextureTest","dataTextureNeedUpdate","judgeStyleAttributes","encodeData","getEncodedData","calDataFrame","cellLength","cellProperties","data","width","height","rowCount","dataTexture","createTexture2D","flipY","format","LUMINANCE","type","FLOAT","u_additive","u_dataTexture","u_cellTypeLayout","getCellTypeLayout","u_opacity","u_offsets","isOffsetStatic","u_stroke_opacity","u_stroke_width","u_stroke_color","getStrokeColor","buildModels","mask","maskInside","buildLayerModel","moduleName","vertexShader","simplePointVert","fragmentShader","simplePointFrag","triangulation","depth","enable","primitive","POINTS","getBlend","stencil","destroy","styleAttributeService","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","update","featureIdx","vertex","attributeIdx","Array","isArray","additive"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  BlendType,\n  gl,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n} from '@antv/l7-core';\n\nimport { getMask } from '@antv/l7-utils';\nimport { isNumber } from 'lodash';\nimport BaseModel from '../../core/BaseModel';\nimport { IPointLayerStyleOptions } from '../../core/interface';\n\nimport simplePointFrag from '../shaders/simplePoint_frag.glsl';\nimport simplePointVert from '../shaders/simplePoint_vert.glsl';\n\nexport function PointTriangulation(feature: IEncodeFeature) {\n  const coordinates = feature.coordinates as number[];\n  return {\n    vertices: [...coordinates],\n    indices: [0],\n    size: coordinates.length,\n  };\n}\n\nexport default class SimplePointModel extends BaseModel {\n  public getDefaultStyle(): Partial<IPointLayerStyleOptions> {\n    return {\n      blend: 'additive',\n    };\n  }\n  public getUninforms(): IModelUniform {\n    const {\n      opacity = 1,\n      offsets = [0, 0],\n      blend,\n      strokeOpacity = 1,\n      strokeWidth = 0,\n      stroke = '#fff',\n    } = this.layer.getLayerConfig() as IPointLayerStyleOptions;\n\n    if (\n      this.dataTextureTest &&\n      this.dataTextureNeedUpdate({\n        opacity,\n        offsets,\n      })\n    ) {\n      // 判断当前的样式中哪些是需要进行数据映射的，哪些是常量，同时计算用于构建数据纹理的一些中间变量\n      this.judgeStyleAttributes({\n        opacity,\n        offsets,\n      });\n      const encodeData = this.layer.getEncodedData();\n      const { data, width, height } = this.calDataFrame(\n        this.cellLength,\n        encodeData,\n        this.cellProperties,\n      );\n      this.rowCount = height; // 当前数据纹理有多少行\n\n      this.dataTexture =\n        this.cellLength > 0 && data.length > 0\n          ? this.createTexture2D({\n              flipY: true,\n              data,\n              format: gl.LUMINANCE,\n              type: gl.FLOAT,\n              width,\n              height,\n            })\n          : this.createTexture2D({\n              flipY: true,\n              data: [1],\n              format: gl.LUMINANCE,\n              type: gl.FLOAT,\n              width: 1,\n              height: 1,\n            });\n    }\n    return {\n      u_additive: blend === 'additive' ? 1.0 : 0.0,\n      u_dataTexture: this.dataTexture, // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]\n      u_cellTypeLayout: this.getCellTypeLayout(),\n\n      u_opacity: isNumber(opacity) ? opacity : 1.0,\n      u_offsets: this.isOffsetStatic(offsets)\n        ? (offsets as [number, number])\n        : [0, 0],\n      u_stroke_opacity: isNumber(strokeOpacity) ? strokeOpacity : 1.0,\n      u_stroke_width: isNumber(strokeWidth) ? strokeWidth : 0.0,\n      u_stroke_color: this.getStrokeColor(stroke),\n    };\n  }\n\n  public initModels(): IModel[] {\n    return this.buildModels();\n  }\n\n  public buildModels(): IModel[] {\n    const {\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IPointLayerStyleOptions;\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'simplepoint',\n        vertexShader: simplePointVert,\n        fragmentShader: simplePointFrag,\n        triangulation: PointTriangulation,\n        depth: { enable: false },\n        primitive: gl.POINTS,\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      }),\n    ];\n  }\n\n  public clearModels() {\n    this.dataTexture?.destroy();\n  }\n\n  protected registerBuiltinAttributes() {\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'size',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Size',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 1,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          const { size = 1 } = feature;\n          return Array.isArray(size) ? [size[0]] : [size as number];\n        },\n      },\n    });\n  }\n\n  private defaultStyleOptions(): Partial<IPointLayerStyleOptions> {\n    return {\n      blend: BlendType.additive,\n    };\n  }\n}\n"],"file":"simplePoint.js"}
+{"version":3,"sources":["../../../src/point/models/simplePoint.ts"],"names":["AttributeType","BlendType","gl","getMask","BaseModel","PointTriangulation","feature","coordinates","vertices","indices","size","length","SimplePointModel","blend","layer","getLayerConfig","opacity","offsets","strokeOpacity","strokeWidth","stroke","dataTextureTest","dataTextureNeedUpdate","judgeStyleAttributes","encodeData","getEncodedData","calDataFrame","cellLength","cellProperties","data","width","height","rowCount","dataTexture","createTexture2D","flipY","format","LUMINANCE","type","FLOAT","u_additive","u_dataTexture","u_cellTypeLayout","getCellTypeLayout","u_opacity","u_offsets","isOffsetStatic","u_stroke_opacity","u_stroke_width","u_stroke_color","getStrokeColor","buildModels","mask","maskInside","triangulation","buildLayerModel","moduleName","vertexShader","simplePointVert","fragmentShader","simplePointFrag","depth","enable","primitive","POINTS","getBlend","stencil","destroy","styleAttributeService","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","update","featureIdx","vertex","attributeIdx","Array","isArray","additive"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  BlendType,\n  gl,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n} from '@antv/l7-core';\n\nimport { getMask } from '@antv/l7-utils';\nimport { isNumber } from 'lodash';\nimport BaseModel from '../../core/BaseModel';\nimport { IPointLayerStyleOptions } from '../../core/interface';\n\nimport simplePointFrag from '../shaders/simplePoint_frag.glsl';\nimport simplePointVert from '../shaders/simplePoint_vert.glsl';\n\nexport function PointTriangulation(feature: IEncodeFeature) {\n  const coordinates = feature.coordinates as number[];\n  return {\n    vertices: [...coordinates],\n    indices: [0],\n    size: coordinates.length,\n  };\n}\n\nexport default class SimplePointModel extends BaseModel {\n  public getDefaultStyle(): Partial<IPointLayerStyleOptions> {\n    return {\n      blend: 'additive',\n    };\n  }\n  public getUninforms(): IModelUniform {\n    const {\n      opacity = 1,\n      offsets = [0, 0],\n      blend,\n      strokeOpacity = 1,\n      strokeWidth = 0,\n      stroke = '#fff',\n    } = this.layer.getLayerConfig() as IPointLayerStyleOptions;\n\n    if (\n      this.dataTextureTest &&\n      this.dataTextureNeedUpdate({\n        opacity,\n        offsets,\n      })\n    ) {\n      // 判断当前的样式中哪些是需要进行数据映射的，哪些是常量，同时计算用于构建数据纹理的一些中间变量\n      this.judgeStyleAttributes({\n        opacity,\n        offsets,\n      });\n      const encodeData = this.layer.getEncodedData();\n      const { data, width, height } = this.calDataFrame(\n        this.cellLength,\n        encodeData,\n        this.cellProperties,\n      );\n      this.rowCount = height; // 当前数据纹理有多少行\n\n      this.dataTexture =\n        this.cellLength > 0 && data.length > 0\n          ? this.createTexture2D({\n              flipY: true,\n              data,\n              format: gl.LUMINANCE,\n              type: gl.FLOAT,\n              width,\n              height,\n            })\n          : this.createTexture2D({\n              flipY: true,\n              data: [1],\n              format: gl.LUMINANCE,\n              type: gl.FLOAT,\n              width: 1,\n              height: 1,\n            });\n    }\n    return {\n      u_additive: blend === 'additive' ? 1.0 : 0.0,\n      u_dataTexture: this.dataTexture, // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]\n      u_cellTypeLayout: this.getCellTypeLayout(),\n\n      u_opacity: isNumber(opacity) ? opacity : 1.0,\n      u_offsets: this.isOffsetStatic(offsets)\n        ? (offsets as [number, number])\n        : [0, 0],\n      u_stroke_opacity: isNumber(strokeOpacity) ? strokeOpacity : 1.0,\n      u_stroke_width: isNumber(strokeWidth) ? strokeWidth : 0.0,\n      u_stroke_color: this.getStrokeColor(stroke),\n    };\n  }\n\n  public initModels(): IModel[] {\n    return this.buildModels();\n  }\n\n  public buildModels(): IModel[] {\n    const {\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IPointLayerStyleOptions;\n    this.layer.triangulation = PointTriangulation;\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'simplepoint',\n        vertexShader: simplePointVert,\n        fragmentShader: simplePointFrag,\n        triangulation: PointTriangulation,\n        depth: { enable: false },\n        primitive: gl.POINTS,\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      }),\n    ];\n  }\n\n  public clearModels() {\n    this.dataTexture?.destroy();\n  }\n\n  protected registerBuiltinAttributes() {\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'size',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Size',\n        buffer: {\n          // give the WebGL driver a hint that this buffer may change\n          usage: gl.DYNAMIC_DRAW,\n          data: [],\n          type: gl.FLOAT,\n        },\n        size: 1,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          const { size = 1 } = feature;\n          return Array.isArray(size) ? [size[0]] : [size as number];\n        },\n      },\n    });\n  }\n\n  private defaultStyleOptions(): Partial<IPointLayerStyleOptions> {\n    return {\n      blend: BlendType.additive,\n    };\n  }\n}\n"],"file":"simplePoint.js"}

package/es/polygon/models/fill.js

@@ -102,6 +102,7 @@ var FillModel = function (_BaseModel) {
           _ref2$maskInside = _ref2.maskInside,
           maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
 
+      this.layer.triangulation = opacityLinear.enable ? polygonTriangulationWithCenter : polygonTriangulation;
       return [this.layer.buildLayerModel({
         moduleName: 'polygon',
         vertexShader: opacityLinear.enable ? polygon_linear_vert : polygon_vert,

package/es/polygon/models/fill.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/polygon/models/fill.ts"],"names":["AttributeType","gl","getMask","BaseModel","polygonTriangulation","polygonTriangulationWithCenter","FillModel","layer","getLayerConfig","raisingHeight","opacity","opacityLinear","enable","dir","dataTextureTest","dataTextureNeedUpdate","judgeStyleAttributes","encodeData","getEncodedData","calDataFrame","cellLength","cellProperties","data","width","height","rowCount","dataTexture","length","createTexture2D","flipY","format","LUMINANCE","type","FLOAT","u_dataTexture","u_cellTypeLayout","getCellTypeLayout","u_raisingHeight","Number","u_opacity","u_opacitylinear","u_dir","buildModels","mask","maskInside","buildLayerModel","moduleName","vertexShader","polygon_linear_vert","polygon_vert","fragmentShader","polygon_linear_frag","polygon_frag","triangulation","blend","getBlend","depth","cull","face","BACK","stencil","destroy","styleAttributeService","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","STATIC_DRAW","size","update","feature","featureIdx","vertex","attributeIdx","normal"],"mappings":";;;;;;;;;;;AAAA,SAASA,aAAT,EAAwBC,EAAxB,QAA0D,eAA1D;AACA,SAASC,OAAT,QAAwB,gBAAxB;AAEA,OAAOC,SAAP,MAAsB,sBAAtB;AAEA,SACEC,oBADF,EAEEC,8BAFF,QAGO,0BAHP;;;;;;IAQqBC,S;;;;;;;;;;;;;WACnB,wBAAsB;AACpB,iBAOI,KAAKC,KAAL,CAAWC,cAAX,EAPJ;AAAA,oCACEC,aADF;AAAA,UACEA,aADF,mCACkB,CADlB;AAAA,8BAEEC,OAFF;AAAA,UAEEA,OAFF,6BAEY,CAFZ;AAAA,oCAGEC,aAHF;AAAA,UAGEA,aAHF,mCAGkB;AACdC,QAAAA,MAAM,EAAE,KADM;AAEdC,QAAAA,GAAG,EAAE;AAFS,OAHlB;;AAQA,UAAI,KAAKC,eAAL,IAAwB,KAAKC,qBAAL,CAA2B;AAAEL,QAAAA,OAAO,EAAPA;AAAF,OAA3B,CAA5B,EAAqE;AACnE,aAAKM,oBAAL,CAA0B;AAAEN,UAAAA,OAAO,EAAPA;AAAF,SAA1B;AACA,YAAMO,UAAU,GAAG,KAAKV,KAAL,CAAWW,cAAX,EAAnB;;AACA,iCAAgC,KAAKC,YAAL,CAC9B,KAAKC,UADyB,EAE9BH,UAF8B,EAG9B,KAAKI,cAHyB,CAAhC;AAAA,YAAQC,IAAR,sBAAQA,IAAR;AAAA,YAAcC,KAAd,sBAAcA,KAAd;AAAA,YAAqBC,MAArB,sBAAqBA,MAArB;;AAKA,aAAKC,QAAL,GAAgBD,MAAhB;AAEA,aAAKE,WAAL,GACE,KAAKN,UAAL,GAAkB,CAAlB,IAAuBE,IAAI,CAACK,MAAL,GAAc,CAArC,GACI,KAAKC,eAAL,CAAqB;AACnBC,UAAAA,KAAK,EAAE,IADY;AAEnBP,UAAAA,IAAI,EAAJA,IAFmB;AAGnBQ,UAAAA,MAAM,EAAE7B,EAAE,CAAC8B,SAHQ;AAInBC,UAAAA,IAAI,EAAE/B,EAAE,CAACgC,KAJU;AAKnBV,UAAAA,KAAK,EAALA,KALmB;AAMnBC,UAAAA,MAAM,EAANA;AANmB,SAArB,CADJ,GASI,KAAKI,eAAL,CAAqB;AACnBC,UAAAA,KAAK,EAAE,IADY;AAEnBP,UAAAA,IAAI,EAAE,CAAC,CAAD,CAFa;AAGnBQ,UAAAA,MAAM,EAAE7B,EAAE,CAAC8B,SAHQ;AAInBC,UAAAA,IAAI,EAAE/B,EAAE,CAACgC,KAJU;AAKnBV,UAAAA,KAAK,EAAE,CALY;AAMnBC,UAAAA,MAAM,EAAE;AANW,SAArB,CAVN;AAkBD;;AACD,aAAO;AACLU,QAAAA,aAAa,EAAE,KAAKR,WADf;AAELS,QAAAA,gBAAgB,EAAE,KAAKC,iBAAL,EAFb;AAKLC,QAAAA,eAAe,EAAEC,MAAM,CAAC7B,aAAD,CALlB;AAOL8B,QAAAA,SAAS,EAAE,UAAS7B,OAAT,IAAoBA,OAApB,GAA8B,GAPpC;AASL8B,QAAAA,eAAe,EAAEF,MAAM,CAAC3B,aAAa,CAACC,MAAf,CATlB;AAUL6B,QAAAA,KAAK,EAAE9B,aAAa,CAACE,GAAd,KAAsB,IAAtB,GAA6B,GAA7B,GAAmC;AAVrC,OAAP;AAYD;;;WAED,sBAA8B;AAC5B,aAAO,KAAK6B,WAAL,EAAP;AACD;;;WAED,uBAA+B;AAC7B,kBAOI,KAAKnC,KAAL,CAAWC,cAAX,EAPJ;AAAA,sCACEG,aADF;AAAA,UACEA,aADF,oCACkB;AACdC,QAAAA,MAAM,EAAE,KADM;AAEdC,QAAAA,GAAG,EAAE;AAFS,OADlB;AAAA,6BAKE8B,IALF;AAAA,UAKEA,IALF,2BAKS,KALT;AAAA,mCAMEC,UANF;AAAA,UAMEA,UANF,iCAMe,IANf;;AAQA,aAAO,CACL,KAAKrC,KAAL,CAAWsC,eAAX,CAA2B;AACzBC,QAAAA,UAAU,EAAE,SADa;AAEzBC,QAAAA,YAAY,EAAEpC,aAAa,CAACC,MAAd,GAAuBoC,mBAAvB,GAA6CC,YAFlC;AAGzBC,QAAAA,cAAc,EAAEvC,aAAa,CAACC,MAAd,GACZuC,mBADY,GAEZC,YALqB;AAOzBC,QAAAA,aAAa,EAAE1C,aAAa,CAACC,MAAd,GACXP,8BADW,GAEXD,oBATqB;AAUzBkD,QAAAA,KAAK,EAAE,KAAKC,QAAL,EAVkB;AAWzBC,QAAAA,KAAK,EAAE;AAAE5C,UAAAA,MAAM,EAAE;AAAV,SAXkB;AAYzB6C,QAAAA,IAAI,EAAE;AACJ7C,UAAAA,MAAM,EAAE,IADJ;AAEJ8C,UAAAA,IAAI,EAAEzD,EAAE,CAAC0D;AAFL,SAZmB;AAgBzBC,QAAAA,OAAO,EAAE1D,OAAO,CAACyC,IAAD,EAAOC,UAAP;AAhBS,OAA3B,CADK,CAAP;AAoBD;;;WAED,uBAAqB;AAAA;;AACnB,gCAAKlB,WAAL,wEAAkBmC,OAAlB;AACD;;;WAED,qCAAsC;AACpC,kBAKI,KAAKtD,KAAL,CAAWC,cAAX,EALJ;AAAA,sCACEG,aADF;AAAA,UACEA,aADF,oCACkB;AACdC,QAAAA,MAAM,EAAE,KADM;AAEdC,QAAAA,GAAG,EAAE;AAFS,OADlB;;AAMA,UAAIF,aAAa,CAACC,MAAlB,EAA0B;AACxB,aAAKkD,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,UAAAA,IAAI,EAAE,QAD0C;AAEhDhC,UAAAA,IAAI,EAAEhC,aAAa,CAACiE,SAF4B;AAGhDC,UAAAA,UAAU,EAAE;AACVF,YAAAA,IAAI,EAAE,UADI;AAEVG,YAAAA,MAAM,EAAE;AAENC,cAAAA,KAAK,EAAEnE,EAAE,CAACoE,WAFJ;AAGN/C,cAAAA,IAAI,EAAE,EAHA;AAINU,cAAAA,IAAI,EAAE/B,EAAE,CAACgC;AAJH,aAFE;AAQVqC,YAAAA,IAAI,EAAE,CARI;AASVC,YAAAA,MAAM,EAAE,gBACNC,OADM,EAENC,UAFM,EAGNC,MAHM,EAINC,YAJM,EAKNC,MALM,EAMH;AAEH,qBAAO,CAACF,MAAM,CAAC,CAAD,CAAP,EAAYA,MAAM,CAAC,CAAD,CAAlB,EAAuBA,MAAM,CAAC,CAAD,CAA7B,CAAP;AACD;AAlBS;AAHoC,SAAlD;AAwBD;AACF;;;;EA7HoCvE,S;;SAAlBG,S","sourcesContent":["import { AttributeType, gl, IEncodeFeature, IModel } from '@antv/l7-core';\nimport { getMask } from '@antv/l7-utils';\nimport { isNumber } from 'lodash';\nimport BaseModel from '../../core/BaseModel';\nimport { IPolygonLayerStyleOptions } from '../../core/interface';\nimport {\n  polygonTriangulation,\n  polygonTriangulationWithCenter,\n} from '../../core/triangulation';\nimport polygon_frag from '../shaders/polygon_frag.glsl';\nimport polygon_linear_frag from '../shaders/polygon_linear_frag.glsl';\nimport polygon_linear_vert from '../shaders/polygon_linear_vert.glsl';\nimport polygon_vert from '../shaders/polygon_vert.glsl';\nexport default class FillModel extends BaseModel {\n  public getUninforms() {\n    const {\n      raisingHeight = 0,\n      opacity = 1,\n      opacityLinear = {\n        enable: false,\n        dir: 'in',\n      },\n    } = this.layer.getLayerConfig() as IPolygonLayerStyleOptions;\n    if (this.dataTextureTest && this.dataTextureNeedUpdate({ opacity })) {\n      this.judgeStyleAttributes({ opacity });\n      const encodeData = this.layer.getEncodedData();\n      const { data, width, height } = this.calDataFrame(\n        this.cellLength,\n        encodeData,\n        this.cellProperties,\n      );\n      this.rowCount = height; // 当前数据纹理有多少行\n\n      this.dataTexture =\n        this.cellLength > 0 && data.length > 0\n          ? this.createTexture2D({\n              flipY: true,\n              data,\n              format: gl.LUMINANCE,\n              type: gl.FLOAT,\n              width,\n              height,\n            })\n          : this.createTexture2D({\n              flipY: true,\n              data: [1],\n              format: gl.LUMINANCE,\n              type: gl.FLOAT,\n              width: 1,\n              height: 1,\n            });\n    }\n    return {\n      u_dataTexture: this.dataTexture, // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]\n      u_cellTypeLayout: this.getCellTypeLayout(),\n      // u_opacity: opacity,\n\n      u_raisingHeight: Number(raisingHeight),\n\n      u_opacity: isNumber(opacity) ? opacity : 1.0,\n\n      u_opacitylinear: Number(opacityLinear.enable),\n      u_dir: opacityLinear.dir === 'in' ? 1.0 : 0.0,\n    };\n  }\n\n  public initModels(): IModel[] {\n    return this.buildModels();\n  }\n\n  public buildModels(): IModel[] {\n    const {\n      opacityLinear = {\n        enable: false,\n        dir: 'in',\n      },\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IPolygonLayerStyleOptions;\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'polygon',\n        vertexShader: opacityLinear.enable ? polygon_linear_vert : polygon_vert,\n        fragmentShader: opacityLinear.enable\n          ? polygon_linear_frag\n          : polygon_frag,\n        // triangulation: polygonTriangulation,\n        triangulation: opacityLinear.enable\n          ? polygonTriangulationWithCenter\n          : polygonTriangulation,\n        blend: this.getBlend(),\n        depth: { enable: false },\n        cull: {\n          enable: true,\n          face: gl.BACK, // gl.FRONT | gl.BACK;\n        },\n        stencil: getMask(mask, maskInside),\n      }),\n    ];\n  }\n\n  public clearModels() {\n    this.dataTexture?.destroy();\n  }\n\n  protected registerBuiltinAttributes() {\n    const {\n      opacityLinear = {\n        enable: false,\n        dir: 'in',\n      },\n    } = this.layer.getLayerConfig() as IPolygonLayerStyleOptions;\n    if (opacityLinear.enable) {\n      this.styleAttributeService.registerStyleAttribute({\n        name: 'linear',\n        type: AttributeType.Attribute,\n        descriptor: {\n          name: 'a_linear',\n          buffer: {\n            // give the WebGL driver a hint that this buffer may change\n            usage: gl.STATIC_DRAW,\n            data: [],\n            type: gl.FLOAT,\n          },\n          size: 3,\n          update: (\n            feature: IEncodeFeature,\n            featureIdx: number,\n            vertex: number[],\n            attributeIdx: number,\n            normal: number[],\n          ) => {\n            // center[0] center[1] radius\n            return [vertex[3], vertex[4], vertex[5]];\n          },\n        },\n      });\n    }\n  }\n}\n"],"file":"fill.js"}
+{"version":3,"sources":["../../../src/polygon/models/fill.ts"],"names":["AttributeType","gl","getMask","BaseModel","polygonTriangulation","polygonTriangulationWithCenter","FillModel","layer","getLayerConfig","raisingHeight","opacity","opacityLinear","enable","dir","dataTextureTest","dataTextureNeedUpdate","judgeStyleAttributes","encodeData","getEncodedData","calDataFrame","cellLength","cellProperties","data","width","height","rowCount","dataTexture","length","createTexture2D","flipY","format","LUMINANCE","type","FLOAT","u_dataTexture","u_cellTypeLayout","getCellTypeLayout","u_raisingHeight","Number","u_opacity","u_opacitylinear","u_dir","buildModels","mask","maskInside","triangulation","buildLayerModel","moduleName","vertexShader","polygon_linear_vert","polygon_vert","fragmentShader","polygon_linear_frag","polygon_frag","blend","getBlend","depth","cull","face","BACK","stencil","destroy","styleAttributeService","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","STATIC_DRAW","size","update","feature","featureIdx","vertex","attributeIdx","normal"],"mappings":"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","sourcesContent":["import { AttributeType, gl, IEncodeFeature, IModel } from '@antv/l7-core';\nimport { getMask } from '@antv/l7-utils';\nimport { isNumber } from 'lodash';\nimport BaseModel from '../../core/BaseModel';\nimport { IPolygonLayerStyleOptions } from '../../core/interface';\nimport {\n  polygonTriangulation,\n  polygonTriangulationWithCenter,\n} from '../../core/triangulation';\nimport polygon_frag from '../shaders/polygon_frag.glsl';\nimport polygon_linear_frag from '../shaders/polygon_linear_frag.glsl';\nimport polygon_linear_vert from '../shaders/polygon_linear_vert.glsl';\nimport polygon_vert from '../shaders/polygon_vert.glsl';\nexport default class FillModel extends BaseModel {\n  public getUninforms() {\n    const {\n      raisingHeight = 0,\n      opacity = 1,\n      opacityLinear = {\n        enable: false,\n        dir: 'in',\n      },\n    } = this.layer.getLayerConfig() as IPolygonLayerStyleOptions;\n    if (this.dataTextureTest && this.dataTextureNeedUpdate({ opacity })) {\n      this.judgeStyleAttributes({ opacity });\n      const encodeData = this.layer.getEncodedData();\n      const { data, width, height } = this.calDataFrame(\n        this.cellLength,\n        encodeData,\n        this.cellProperties,\n      );\n      this.rowCount = height; // 当前数据纹理有多少行\n\n      this.dataTexture =\n        this.cellLength > 0 && data.length > 0\n          ? this.createTexture2D({\n              flipY: true,\n              data,\n              format: gl.LUMINANCE,\n              type: gl.FLOAT,\n              width,\n              height,\n            })\n          : this.createTexture2D({\n              flipY: true,\n              data: [1],\n              format: gl.LUMINANCE,\n              type: gl.FLOAT,\n              width: 1,\n              height: 1,\n            });\n    }\n    return {\n      u_dataTexture: this.dataTexture, // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]\n      u_cellTypeLayout: this.getCellTypeLayout(),\n      // u_opacity: opacity,\n\n      u_raisingHeight: Number(raisingHeight),\n\n      u_opacity: isNumber(opacity) ? opacity : 1.0,\n\n      u_opacitylinear: Number(opacityLinear.enable),\n      u_dir: opacityLinear.dir === 'in' ? 1.0 : 0.0,\n    };\n  }\n\n  public initModels(): IModel[] {\n    return this.buildModels();\n  }\n\n  public buildModels(): IModel[] {\n    const {\n      opacityLinear = {\n        enable: false,\n        dir: 'in',\n      },\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IPolygonLayerStyleOptions;\n    this.layer.triangulation = opacityLinear.enable\n      ? polygonTriangulationWithCenter\n      : polygonTriangulation;\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'polygon',\n        vertexShader: opacityLinear.enable ? polygon_linear_vert : polygon_vert,\n        fragmentShader: opacityLinear.enable\n          ? polygon_linear_frag\n          : polygon_frag,\n        // triangulation: polygonTriangulation,\n        triangulation: opacityLinear.enable\n          ? polygonTriangulationWithCenter\n          : polygonTriangulation,\n        blend: this.getBlend(),\n        depth: { enable: false },\n        cull: {\n          enable: true,\n          face: gl.BACK, // gl.FRONT | gl.BACK;\n        },\n        stencil: getMask(mask, maskInside),\n      }),\n    ];\n  }\n\n  public clearModels() {\n    this.dataTexture?.destroy();\n  }\n\n  protected registerBuiltinAttributes() {\n    const {\n      opacityLinear = {\n        enable: false,\n        dir: 'in',\n      },\n    } = this.layer.getLayerConfig() as IPolygonLayerStyleOptions;\n    if (opacityLinear.enable) {\n      this.styleAttributeService.registerStyleAttribute({\n        name: 'linear',\n        type: AttributeType.Attribute,\n        descriptor: {\n          name: 'a_linear',\n          buffer: {\n            // give the WebGL driver a hint that this buffer may change\n            usage: gl.STATIC_DRAW,\n            data: [],\n            type: gl.FLOAT,\n          },\n          size: 3,\n          update: (\n            feature: IEncodeFeature,\n            featureIdx: number,\n            vertex: number[],\n            attributeIdx: number,\n            normal: number[],\n          ) => {\n            // center[0] center[1] radius\n            return [vertex[3], vertex[4], vertex[5]];\n          },\n        },\n      });\n    }\n  }\n}\n"],"file":"fill.js"}

package/es/utils/layerData.d.ts

@@ -0,0 +1,2 @@
+import { IEncodeFeature, IFontService, ILayer, IMapService, ISourceCFG, IStyleAttributeService } from '@antv/l7-core';
+export declare function calculateData(layer: ILayer, fontService: IFontService, mapService: IMapService, styleAttributeService: IStyleAttributeService, data: any, options: ISourceCFG | undefined): IEncodeFeature[];

package/es/utils/layerData.js

@@ -0,0 +1,152 @@
+import { Version } from '@antv/l7-maps';
+import Source from '@antv/l7-source';
+import { isColor, normalize, rgb2arr } from '@antv/l7-utils';
+
+function getArrowPoints(p1, p2) {
+  var dir = [p2[0] - p1[0], p2[1] - p1[1]];
+  var normalizeDir = normalize(dir);
+  var arrowPoint = [p1[0] + normalizeDir[0] * 0.0001, p1[1] + normalizeDir[1] * 0.0001];
+  return arrowPoint;
+}
+
+function adjustData2Amap2Coordinates(mappedData, mapService) {
+  var _this = this;
+
+  if (mappedData.length > 0 && mapService.version === Version['GAODE2.x']) {
+    if (typeof mappedData[0].coordinates[0] === 'number') {
+      mappedData.filter(function (d) {
+        return !d.originCoordinates;
+      }).map(function (d) {
+        d.version = Version['GAODE2.x'];
+        d.originCoordinates = cloneDeep(d.coordinates);
+        d.coordinates = _this.mapService.lngLatToCoord(d.coordinates);
+      });
+    } else {
+      mappedData.filter(function (d) {
+        return !d.originCoordinates;
+      }).map(function (d) {
+        d.version = Version['GAODE2.x'];
+        d.originCoordinates = cloneDeep(d.coordinates);
+        d.coordinates = _this.mapService.lngLatToCoords(d.coordinates);
+      });
+    }
+  }
+}
+
+function adjustData2SimpleCoordinates(mappedData, mapService) {
+  if (mappedData.length > 0 && mapService.version === Version.SIMPLE) {
+    mappedData.map(function (d) {
+      if (!d.simpleCoordinate) {
+        d.coordinates = unProjectCoordinates(d.coordinates, mapService);
+        d.simpleCoordinate = true;
+      }
+    });
+  }
+}
+
+function unProjectCoordinates(coordinates, mapService) {
+  if (typeof coordinates[0] === 'number') {
+    return 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(mapService.simpleMapCoord.unproject(co));
+      });
+      coords.push(c1);
+    });
+    return coords;
+  } else {
+    var _coords = [];
+    coordinates.map(function (coord) {
+      _coords.push(mapService.simpleMapCoord.unproject(coord));
+    });
+    return _coords;
+  }
+}
+
+function applyAttributeMapping(attribute, record, minimumColor) {
+  var _attribute$scale;
+
+  if (!attribute.scale) {
+    return [];
+  }
+
+  var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
+  var params = [];
+  scalers.forEach(function (_ref) {
+    var _attribute$scale2;
+
+    var field = _ref.field;
+
+    if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
+      params.push(record[field]);
+    }
+  });
+  var mappingResult = attribute.mapping ? attribute.mapping(params) : [];
+
+  if (attribute.name === 'color' && !isColor(mappingResult[0])) {
+    return [minimumColor];
+  }
+
+  return mappingResult;
+}
+
+function mapping(attributes, data, fontService, mapService, minimumColor, layer) {
+  var _ref2 = layer === null || layer === void 0 ? void 0 : layer.getLayerConfig(),
+      _ref2$arrow = _ref2.arrow,
+      arrow = _ref2$arrow === void 0 ? {
+    enable: false
+  } : _ref2$arrow;
+
+  var mappedData = data.map(function (record) {
+    var encodeRecord = {
+      id: record._id,
+      coordinates: record.coordinates
+    };
+    attributes.filter(function (attribute) {
+      return attribute.scale !== undefined;
+    }).forEach(function (attribute) {
+      var values = applyAttributeMapping(attribute, record, minimumColor);
+      attribute.needRemapping = false;
+
+      if (attribute.name === 'color') {
+        values = values.map(function (c) {
+          return rgb2arr(c);
+        });
+      }
+
+      encodeRecord[attribute.name] = Array.isArray(values) && values.length === 1 ? values[0] : values;
+
+      if (attribute.name === 'shape') {
+        encodeRecord.shape = fontService.getIconFontKey(encodeRecord[attribute.name]);
+      }
+    });
+
+    if (encodeRecord.shape === 'line' && arrow.enable) {
+      var coords = encodeRecord.coordinates;
+      var arrowPoint = getArrowPoints(coords[0], coords[1]);
+      encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);
+    }
+
+    return encodeRecord;
+  });
+  adjustData2Amap2Coordinates(mappedData, mapService);
+  adjustData2SimpleCoordinates(mappedData, mapService);
+  return mappedData;
+}
+
+export function calculateData(layer, fontService, mapService, styleAttributeService, data, options) {
+  var source = new Source(data, options);
+  var bottomColor = layer.getBottomColor();
+  var attributes = styleAttributeService.getLayerStyleAttributes() || [];
+  var dataArray = source.data.dataArray;
+  var filterData = dataArray;
+  var mappedEncodeData = mapping(attributes, filterData, fontService, mapService, bottomColor, layer);
+  source.destroy();
+  return mappedEncodeData;
+}
+//# sourceMappingURL=layerData.js.map

package/es/utils/layerData.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utils/layerData.ts"],"names":["Version","Source","isColor","normalize","rgb2arr","getArrowPoints","p1","p2","dir","normalizeDir","arrowPoint","adjustData2Amap2Coordinates","mappedData","mapService","length","version","coordinates","filter","d","originCoordinates","map","cloneDeep","lngLatToCoord","lngLatToCoords","adjustData2SimpleCoordinates","SIMPLE","simpleCoordinate","unProjectCoordinates","simpleMapCoord","unproject","Array","coords","coord","c1","co","push","applyAttributeMapping","attribute","record","minimumColor","scale","scalers","params","forEach","field","hasOwnProperty","type","mappingResult","mapping","name","attributes","data","fontService","layer","getLayerConfig","arrow","enable","encodeRecord","id","_id","undefined","values","needRemapping","c","isArray","shape","getIconFontKey","splice","calculateData","styleAttributeService","options","source","bottomColor","getBottomColor","getLayerStyleAttributes","dataArray","filterData","mappedEncodeData","destroy"],"mappings":"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","sourcesContent":["import {\n  IEncodeFeature,\n  IFontService,\n  ILayer,\n  IMapService,\n  IParseDataItem,\n  ISourceCFG,\n  IStyleAttribute,\n  IStyleAttributeService,\n  Position,\n} from '@antv/l7-core';\nimport { Version } from '@antv/l7-maps';\nimport Source from '@antv/l7-source';\nimport { isColor, normalize, rgb2arr } from '@antv/l7-utils';\nimport { ILineLayerStyleOptions } from '../core/interface';\n\nfunction getArrowPoints(p1: Position, p2: Position) {\n  const dir = [p2[0] - p1[0], p2[1] - p1[1]];\n  const normalizeDir = normalize(dir);\n  const arrowPoint = [\n    p1[0] + normalizeDir[0] * 0.0001,\n    p1[1] + normalizeDir[1] * 0.0001,\n  ];\n  return arrowPoint;\n}\n\nfunction adjustData2Amap2Coordinates(\n  mappedData: IEncodeFeature[],\n  mapService: IMapService,\n) {\n  // 根据地图的类型判断是否需要对点位数据进行处理, 若是高德2.0则需要对坐标进行相对偏移\n  if (mappedData.length > 0 && mapService.version === 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 = 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 = 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\nfunction adjustData2SimpleCoordinates(\n  mappedData: IEncodeFeature[],\n  mapService: IMapService,\n) {\n  if (mappedData.length > 0 && mapService.version === Version.SIMPLE) {\n    mappedData.map((d) => {\n      if (!d.simpleCoordinate) {\n        d.coordinates = unProjectCoordinates(d.coordinates, mapService);\n        d.simpleCoordinate = true;\n      }\n    });\n  }\n}\n\nfunction unProjectCoordinates(coordinates: any, mapService: IMapService) {\n  if (typeof coordinates[0] === 'number') {\n    return mapService.simpleMapCoord.unproject(coordinates as [number, number]);\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(mapService.simpleMapCoord.unproject(co as [number, number]));\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        mapService.simpleMapCoord.unproject(coord as [number, number]),\n      );\n    });\n    // @ts-ignore\n    return coords;\n  }\n}\n\nfunction 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 (record.hasOwnProperty(field) || attribute.scale?.type === 'variable') {\n      // TODO:多字段，常量\n      params.push(record[field]);\n    }\n  });\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}\n\nfunction mapping(\n  attributes: IStyleAttribute[],\n  data: IParseDataItem[],\n  fontService: IFontService,\n  mapService: IMapService,\n  minimumColor?: string,\n  layer?: ILayer,\n): IEncodeFeature[] {\n  const {\n    arrow = {\n      enable: false,\n    },\n  } = layer?.getLayerConfig() as ILineLayerStyleOptions;\n  const mappedData = data.map((record: IParseDataItem) => {\n    const encodeRecord: IEncodeFeature = {\n      id: record._id,\n      coordinates: record.coordinates,\n    };\n\n    attributes\n      .filter((attribute) => attribute.scale !== undefined)\n      .forEach((attribute: IStyleAttribute) => {\n        let values = applyAttributeMapping(attribute, record, minimumColor);\n\n        attribute.needRemapping = false;\n\n        // TODO: 支持每个属性配置 postprocess\n        if (attribute.name === 'color') {\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 = fontService.getIconFontKey(\n            encodeRecord[attribute.name] as string,\n          );\n        }\n      });\n\n    if (encodeRecord.shape === 'line' && arrow.enable) {\n      // 只有在线图层且支持配置箭头的时候进行插入顶点的处理\n      const coords = encodeRecord.coordinates as Position[];\n      const arrowPoint = getArrowPoints(coords[0], coords[1]);\n      encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);\n    }\n    return encodeRecord;\n  }) as IEncodeFeature[];\n  // 调整数据兼容 Amap2.0\n  adjustData2Amap2Coordinates(mappedData, mapService);\n\n  // 调整数据兼容 SimpleCoordinates\n  adjustData2SimpleCoordinates(mappedData, mapService);\n\n  return mappedData;\n}\n\nexport function calculateData(\n  layer: ILayer,\n  fontService: IFontService,\n  mapService: IMapService,\n  styleAttributeService: IStyleAttributeService,\n  data: any,\n  options: ISourceCFG | undefined,\n): IEncodeFeature[] {\n  const source = new Source(data, options);\n  const bottomColor = layer.getBottomColor();\n  const attributes = styleAttributeService.getLayerStyleAttributes() || [];\n  const { dataArray } = source.data;\n  const filterData = dataArray;\n\n  const mappedEncodeData = mapping(\n    attributes,\n    filterData,\n    fontService,\n    mapService,\n    bottomColor,\n    layer,\n  );\n  source.destroy();\n  return mappedEncodeData;\n}\n"],"file":"layerData.js"}

package/lib/Geometry/models/plane.js

@@ -56,9 +56,9 @@ var PlaneModel = function (_BaseModel) {
 
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "texture", void 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "terrainImage", void 0);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "terrainImageLoaded", false);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mapTexture", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "positions", void 0);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "indices", void 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "planeGeometryTriangulation", function () {
       var _this2;
 
@@ -79,11 +79,8 @@ var PlaneModel = function (_BaseModel) {
           indices = _this$initPlane.indices,
           positions = _this$initPlane.positions;
 
-      _this.positions = positions;
-      _this.indices = indices;
-
       if (terrainTexture) {
-        _this.loadTerrainTexture();
+        _this.loadTerrainTexture(positions, indices);
       }
 
       return {
@@ -92,13 +89,6 @@ var PlaneModel = function (_BaseModel) {
         size: 5
       };
     });
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "planeGeometryUpdateTriangulation", function () {
-      return {
-        vertices: _this.positions,
-        indices: _this.indices,
-        size: 5
-      };
-    });
     return _this;
   }
 
@@ -132,9 +122,9 @@ var PlaneModel = function (_BaseModel) {
             var _ref2 = this.mapService.lngLatToCoord([x + lng, -y + lat]),
                 _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
                 a = _ref3[0],
-                b = _ref3[1];
+                _b = _ref3[1];
 
-            positions.push(a, b, 0);
+            positions.push(a, _b, 0);
           } else {
             positions.push(x + lng, -y + lat, 0);
           }
@@ -148,12 +138,12 @@ var PlaneModel = function (_BaseModel) {
         for (var _ix = 0; _ix < gridX; _ix++) {
           var _a = _ix + gridX1 * _iy;
 
-          var _b = _ix + gridX1 * (_iy + 1);
+          var _b2 = _ix + gridX1 * (_iy + 1);
 
           var c = _ix + 1 + gridX1 * (_iy + 1);
           var d = _ix + 1 + gridX1 * _iy;
-          indices.push(_a, _b, d);
-          indices.push(_b, c, d);
+          indices.push(_a, _b2, d);
+          indices.push(_b2, c, d);
         }
       }
 
@@ -192,6 +182,7 @@ var PlaneModel = function (_BaseModel) {
     value: function clearModels() {
       var _this$texture2;
 
+      this.terrainImage = null;
       (_this$texture2 = this.texture) === null || _this$texture2 === void 0 ? void 0 : _this$texture2.destroy();
     }
   }, {
@@ -228,101 +219,42 @@ var PlaneModel = function (_BaseModel) {
         }
       })];
     }
-  }, {
-    key: "getImageData",
-    value: function getImageData(img) {
-      var canvas = document.createElement('canvas');
-      var ctx = canvas.getContext('2d');
-      var width = img.width,
-          height = img.height;
-      canvas.width = width;
-      canvas.height = height;
-      ctx.drawImage(img, 0, 0, width, height);
-      var imageData = ctx.getImageData(0, 0, width, height);
-      return imageData;
-    }
-  }, {
-    key: "loadTerrainTexture",
-    value: function loadTerrainTexture() {
-      var _this3 = this;
-
-      var _ref6 = this.layer.getLayerConfig(),
-          _ref6$mask = _ref6.mask,
-          mask = _ref6$mask === void 0 ? false : _ref6$mask,
-          _ref6$maskInside = _ref6.maskInside,
-          maskInside = _ref6$maskInside === void 0 ? true : _ref6$maskInside,
-          _ref6$widthSegments = _ref6.widthSegments,
-          widthSegments = _ref6$widthSegments === void 0 ? 1 : _ref6$widthSegments,
-          _ref6$heightSegments = _ref6.heightSegments,
-          heightSegments = _ref6$heightSegments === void 0 ? 1 : _ref6$heightSegments,
-          terrainTexture = _ref6.terrainTexture,
-          _ref6$rgb2height = _ref6.rgb2height,
-          rgb2height = _ref6$rgb2height === void 0 ? function (r, g, b) {
-        return r + g + b;
-      } : _ref6$rgb2height;
-
-      var terrainImage = new Image();
-      terrainImage.crossOrigin = 'anonymous';
-
-      terrainImage.onload = function () {
-        var imgWidth = terrainImage.width;
-        var imgHeight = terrainImage.height;
-
-        var imageData = _this3.getImageData(terrainImage).data;
-
-        var gridX = Math.floor(widthSegments);
-        var gridY = Math.floor(heightSegments);
-        var gridX1 = gridX + 1;
-        var gridY1 = gridY + 1;
-        var widthStep = imgWidth / gridX;
-        var heihgtStep = imgHeight / gridY;
-
-        for (var iy = 0; iy < gridY1; iy++) {
-          var imgIndexY = Math.floor(iy * heihgtStep);
-          var imgLen = imgIndexY * imgWidth;
-
-          for (var ix = 0; ix < gridX1; ix++) {
-            var imgIndexX = Math.floor(ix * widthStep);
-            var imgDataIndex = (imgLen + imgIndexX) * 4;
-            var r = imageData[imgDataIndex];
-            var g = imageData[imgDataIndex + 1];
-            var b = imageData[imgDataIndex + 2];
-            var z = (iy * gridX1 + ix) * 5 + 2;
-            _this3.positions[z] = rgb2height(r, g, b);
-          }
-        }
-
-        _this3.layer.models = [_this3.layer.buildLayerModel({
-          moduleName: 'geometry_plane',
-          vertexShader: planeVert,
-          fragmentShader: planeFrag,
-          triangulation: _this3.planeGeometryUpdateTriangulation,
-          primitive: _l7Core.gl.TRIANGLES,
-          depth: {
-            enable: true
-          },
-          blend: _this3.getBlend(),
-          stencil: (0, _l7Utils.getMask)(mask, maskInside),
-          cull: {
-            enable: true,
-            face: _l7Core.gl.BACK
-          }
-        })];
-
-        _this3.layerService.renderLayers();
-      };
-
-      terrainImage.src = terrainTexture;
-    }
   }, {
     key: "buildModels",
     value: function buildModels() {
       return this.initModels();
     }
+  }, {
+    key: "createModelData",
+    value: function createModelData(options) {
+      if (options) {
+        var _ref6 = this.layer.getLayerConfig(),
+            oldwidthSegments = _ref6.widthSegments,
+            oldheightSegments = _ref6.heightSegments,
+            oldwidth = _ref6.width,
+            oldheight = _ref6.height;
+
+        var _ref7 = options,
+            widthSegments = _ref7.widthSegments,
+            heightSegments = _ref7.heightSegments,
+            width = _ref7.width,
+            height = _ref7.height;
+        this.layer.style({
+          widthSegments: widthSegments !== undefined ? widthSegments : oldwidthSegments,
+          heightSegments: heightSegments !== undefined ? heightSegments : oldheightSegments,
+          width: width !== undefined ? width : oldwidth,
+          height: height !== undefined ? height : oldheight
+        });
+      }
+
+      var oldFeatures = this.layer.getEncodedData();
+      var res = this.styleAttributeService.createAttributesAndIndices(oldFeatures, this.planeGeometryTriangulation);
+      return res;
+    }
   }, {
     key: "updateTexture",
     value: function updateTexture(mapTexture) {
-      var _this4 = this;
+      var _this3 = this;
 
       var createTexture2D = this.rendererService.createTexture2D;
 
@@ -331,7 +263,7 @@ var PlaneModel = function (_BaseModel) {
         img.crossOrigin = 'anonymous';
 
         img.onload = function () {
-          _this4.texture = createTexture2D({
+          _this3.texture = createTexture2D({
             data: img,
             width: img.width,
             height: img.height,
@@ -339,9 +271,9 @@ var PlaneModel = function (_BaseModel) {
             wrapT: _l7Core.gl.CLAMP_TO_EDGE
           });
 
-          _this4.layerService.updateLayerRenderList();
+          _this3.layerService.updateLayerRenderList();
 
-          _this4.layerService.renderLayers();
+          _this3.layerService.renderLayers();
         };
 
         img.src = mapTexture;
@@ -352,6 +284,99 @@ var PlaneModel = function (_BaseModel) {
         });
       }
     }
+  }, {
+    key: "getImageData",
+    value: function getImageData(img) {
+      var canvas = document.createElement('canvas');
+      var ctx = canvas.getContext('2d');
+      var width = img.width,
+          height = img.height;
+      canvas.width = width;
+      canvas.height = height;
+      ctx.drawImage(img, 0, 0, width, height);
+      var imageData = ctx.getImageData(0, 0, width, height);
+      return imageData;
+    }
+  }, {
+    key: "translateVertex",
+    value: function translateVertex(positions, indices, image, widthSegments, heightSegments, rgb2height) {
+      var imgWidth = image.width;
+      var imgHeight = image.height;
+      var imageData = this.getImageData(image).data;
+      var gridX = Math.floor(widthSegments);
+      var gridY = Math.floor(heightSegments);
+      var gridX1 = gridX + 1;
+      var gridY1 = gridY + 1;
+      var widthStep = imgWidth / gridX;
+      var heihgtStep = imgHeight / gridY;
+
+      for (var iy = 0; iy < gridY1; iy++) {
+        var imgIndexY = Math.floor(iy * heihgtStep);
+        var imgLen = imgIndexY * imgWidth;
+
+        for (var ix = 0; ix < gridX1; ix++) {
+          var imgIndexX = Math.floor(ix * widthStep);
+          var imgDataIndex = (imgLen + imgIndexX) * 4;
+          var _r = imageData[imgDataIndex];
+          var _g = imageData[imgDataIndex + 1];
+          var _b3 = imageData[imgDataIndex + 2];
+          var z = (iy * gridX1 + ix) * 5 + 2;
+          positions[z] = rgb2height(_r, _g, _b3);
+        }
+      }
+
+      var oldFeatures = this.layer.getEncodedData();
+      var modelData = this.styleAttributeService.createAttributesAndIndices(oldFeatures, function () {
+        return {
+          vertices: positions,
+          indices: indices,
+          size: 5
+        };
+      });
+      this.layer.updateModelData(modelData);
+      this.layerService.renderLayers();
+    }
+  }, {
+    key: "loadTerrainTexture",
+    value: function loadTerrainTexture(positions, indices) {
+      var _this4 = this;
+
+      var _ref8 = this.layer.getLayerConfig(),
+          _ref8$widthSegments = _ref8.widthSegments,
+          widthSegments = _ref8$widthSegments === void 0 ? 1 : _ref8$widthSegments,
+          _ref8$heightSegments = _ref8.heightSegments,
+          heightSegments = _ref8$heightSegments === void 0 ? 1 : _ref8$heightSegments,
+          terrainTexture = _ref8.terrainTexture,
+          _ref8$rgb2height = _ref8.rgb2height,
+          rgb2height = _ref8$rgb2height === void 0 ? function (r, g, b) {
+        return r + g + b;
+      } : _ref8$rgb2height;
+
+      if (this.terrainImage) {
+        if (this.terrainImageLoaded) {
+          this.translateVertex(positions, indices, this.terrainImage, widthSegments, heightSegments, rgb2height);
+        } else {
+          this.terrainImage.onload = function () {
+            _this4.translateVertex(positions, indices, _this4.terrainImage, widthSegments, heightSegments, rgb2height);
+          };
+        }
+      } else {
+        var terrainImage = new Image();
+        this.terrainImage = terrainImage;
+        terrainImage.crossOrigin = 'anonymous';
+
+        terrainImage.onload = function () {
+          _this4.terrainImageLoaded = true;
+          setTimeout(function () {
+            return _this4.layer.emit('terrainImageLoaded', null);
+          });
+
+          _this4.translateVertex(positions, indices, terrainImage, widthSegments, heightSegments, rgb2height);
+        };
+
+        terrainImage.src = terrainTexture;
+      }
+    }
   }, {
     key: "getConfigSchema",
     value: function getConfigSchema() {