@antv/l7-layers 2.9.17-alpha.0 → 2.9.17

package/es/heatmap/models/hexagon.js

@@ -43,20 +43,20 @@ var HexagonModel = function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
+    value: function initModels() {
+      return this.buildModels();
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
+    value: function buildModels() {
       var _ref2 = this.layer.getLayerConfig(),
           _ref2$mask = _ref2.mask,
           mask = _ref2$mask === void 0 ? false : _ref2$mask,
           _ref2$maskInside = _ref2.maskInside,
           maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
 
-      this.layer.buildLayerModel({
-        moduleName: 'heatmapHexagon',
+      return [this.layer.buildLayerModel({
+        moduleName: 'hexagonheatmap',
         vertexShader: heatmapGridVert,
         fragmentShader: heatmapGridFrag,
         triangulation: HeatmapGridTriangulation,
@@ -66,12 +66,7 @@ var HexagonModel = function (_BaseModel) {
         primitive: gl.TRIANGLES,
         blend: this.getBlend(),
         stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
+      })];
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/heatmap/models/hexagon.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/heatmap/models/hexagon.ts"],"names":["AttributeType","gl","getMask","BaseModel","HeatmapGridTriangulation","HexagonModel","layer","getLayerConfig","opacity","coverage","angle","u_opacity","u_coverage","u_angle","u_radius","getSource","data","xOffset","yOffset","callbackModel","buildModels","mask","maskInside","buildLayerModel","moduleName","vertexShader","heatmapGridVert","fragmentShader","heatmapGridFrag","triangulation","depth","enable","primitive","TRIANGLES","blend","getBlend","stencil","then","model","catch","err","console","warn","styleAttributeService","registerStyleAttribute","name","type","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","size","update","feature","featureIdx","coordinates","version","originCoordinates"],"mappings":";;;;;;;;;;AAAA,SACEA,aADF,EAEEC,EAFF,QAMO,eANP;AAOA,SAASC,OAAT,QAAwB,gBAAxB;AACA,OAAOC,SAAP,MAAsB,sBAAtB;AAEA,SAASC,wBAAT,QAAyC,0BAAzC;;;;IAIqBC,Y;;;;;;;;;;;;;WACnB,wBAAqC;AACnC,iBAII,KAAKC,KAAL,CAAWC,cAAX,EAJJ;AAAA,UACEC,OADF,QACEA,OADF;AAAA,UAEEC,QAFF,QAEEA,QAFF;AAAA,UAGEC,KAHF,QAGEA,KAHF;;AAKA,aAAO;AACLC,QAAAA,SAAS,EAAEH,OAAO,IAAI,GADjB;AAELI,QAAAA,UAAU,EAAEH,QAAQ,IAAI,GAFnB;AAGLI,QAAAA,OAAO,EAAEH,KAAK,IAAI,CAHb;AAILI,QAAAA,QAAQ,EAAE,CACR,KAAKR,KAAL,CAAWS,SAAX,GAAuBC,IAAvB,CAA4BC,OADpB,EAER,KAAKX,KAAL,CAAWS,SAAX,GAAuBC,IAAvB,CAA4BE,OAFpB;AAJL,OAAP;AASD;;;WAED,oBAAkBC,aAAlB,EAA6D;AAC3D,WAAKC,WAAL,CAAiBD,aAAjB;AACD;;;WAED,qBAAmBA,aAAnB,EAA8D;AAC5D,kBAGI,KAAKb,KAAL,CAAWC,cAAX,EAHJ;AAAA,6BACEc,IADF;AAAA,UACEA,IADF,2BACS,KADT;AAAA,mCAEEC,UAFF;AAAA,UAEEA,UAFF,iCAEe,IAFf;;AAIA,WAAKhB,KAAL,CACGiB,eADH,CACmB;AACfC,QAAAA,UAAU,EAAE,gBADG;AAEfC,QAAAA,YAAY,EAAEC,eAFC;AAGfC,QAAAA,cAAc,EAAEC,eAHD;AAIfC,QAAAA,aAAa,EAAEzB,wBAJA;AAKf0B,QAAAA,KAAK,EAAE;AAAEC,UAAAA,MAAM,EAAE;AAAV,SALQ;AAMfC,QAAAA,SAAS,EAAE/B,EAAE,CAACgC,SANC;AAOfC,QAAAA,KAAK,EAAE,KAAKC,QAAL,EAPQ;AAQfC,QAAAA,OAAO,EAAElC,OAAO,CAACmB,IAAD,EAAOC,UAAP;AARD,OADnB,EAWGe,IAXH,CAWQ,UAACC,KAAD,EAAW;AACfnB,QAAAA,aAAa,CAAC,CAACmB,KAAD,CAAD,CAAb;AACD,OAbH,EAcGC,KAdH,CAcS,UAACC,GAAD,EAAS;AACdC,QAAAA,OAAO,CAACC,IAAR,CAAaF,GAAb;AACArB,QAAAA,aAAa,CAAC,EAAD,CAAb;AACD,OAjBH;AAkBD;;;WACD,qCAAsC;AACpC,WAAKwB,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,QAAAA,IAAI,EAAE,KAD0C;AAEhDC,QAAAA,IAAI,EAAE9C,aAAa,CAAC+C,SAF4B;AAGhDC,QAAAA,UAAU,EAAE;AACVH,UAAAA,IAAI,EAAE,OADI;AAEVI,UAAAA,MAAM,EAAE;AAENC,YAAAA,KAAK,EAAEjD,EAAE,CAACkD,YAFJ;AAGNnC,YAAAA,IAAI,EAAE,EAHA;AAIN8B,YAAAA,IAAI,EAAE7C,EAAE,CAACmD;AAJH,WAFE;AAQVC,UAAAA,IAAI,EAAE,CARI;AASVC,UAAAA,MAAM,EAAE,gBAACC,OAAD,EAA0BC,UAA1B,EAAiD;AAEvD,gBAAMC,WAAW,GAAIF,OAAO,CAACG,OAAR,KAAoB,UAApB,GACjBH,OAAO,CAACI,iBADS,GAEjBJ,OAAO,CAACE,WAFZ;AAKA,mBAAO,CAACA,WAAW,CAAC,CAAD,CAAZ,EAAiBA,WAAW,CAAC,CAAD,CAA5B,EAAiC,CAAjC,CAAP;AACD;AAjBS;AAHoC,OAAlD;AAuBD;;;;EAtEuCtD,S;;SAArBE,Y","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n} from '@antv/l7-core';\nimport { getMask } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IHeatMapLayerStyleOptions } from '../../core/interface';\nimport { HeatmapGridTriangulation } from '../../core/triangulation';\nimport heatmapGridFrag from '../shaders/hexagon_frag.glsl';\nimport heatmapGridVert from '../shaders/hexagon_vert.glsl';\n\nexport default class HexagonModel extends BaseModel {\n  public getUninforms(): IModelUniform {\n    const {\n      opacity,\n      coverage,\n      angle,\n    } = this.layer.getLayerConfig() as IHeatMapLayerStyleOptions;\n    return {\n      u_opacity: opacity || 1.0,\n      u_coverage: coverage || 0.9,\n      u_angle: angle || 0,\n      u_radius: [\n        this.layer.getSource().data.xOffset,\n        this.layer.getSource().data.yOffset,\n      ],\n    };\n  }\n\n  public initModels(callbackModel: (models: IModel[]) => void) {\n    this.buildModels(callbackModel);\n  }\n\n  public buildModels(callbackModel: (models: IModel[]) => void) {\n    const {\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IHeatMapLayerStyleOptions;\n    this.layer\n      .buildLayerModel({\n        moduleName: 'heatmapHexagon',\n        vertexShader: heatmapGridVert,\n        fragmentShader: heatmapGridFrag,\n        triangulation: HeatmapGridTriangulation,\n        depth: { enable: false },\n        primitive: gl.TRIANGLES,\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      })\n      .then((model) => {\n        callbackModel([model]);\n      })\n      .catch((err) => {\n        console.warn(err);\n        callbackModel([]);\n      });\n  }\n  protected registerBuiltinAttributes() {\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'pos', // 顶点经纬度位置\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Pos',\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: 3,\n        update: (feature: IEncodeFeature, featureIdx: number) => {\n          // const coordinates = (feature.verison==='GAODE2.x'?feature.originoordinates:feature.coordinates) as number[];\n          const coordinates = (feature.version === 'GAODE2.x'\n            ? feature.originCoordinates\n            : feature.coordinates) as number[];\n          // const coordinates = feature.coordinates as number[];\n          // const coordinates = feature.originCoordinates as number[];\n          return [coordinates[0], coordinates[1], 0];\n        },\n      },\n    });\n  }\n}\n"],"file":"hexagon.js"}
+{"version":3,"sources":["../../../src/heatmap/models/hexagon.ts"],"names":["AttributeType","gl","getMask","BaseModel","HeatmapGridTriangulation","HexagonModel","layer","getLayerConfig","opacity","coverage","angle","u_opacity","u_coverage","u_angle","u_radius","getSource","data","xOffset","yOffset","buildModels","mask","maskInside","buildLayerModel","moduleName","vertexShader","heatmapGridVert","fragmentShader","heatmapGridFrag","triangulation","depth","enable","primitive","TRIANGLES","blend","getBlend","stencil","styleAttributeService","registerStyleAttribute","name","type","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","size","update","feature","featureIdx","coordinates","version","originCoordinates"],"mappings":";;;;;;;;;;AAAA,SACEA,aADF,EAEEC,EAFF,QAMO,eANP;AAOA,SAASC,OAAT,QAAwB,gBAAxB;AACA,OAAOC,SAAP,MAAsB,sBAAtB;AAEA,SAASC,wBAAT,QAAyC,0BAAzC;;;;IAIqBC,Y;;;;;;;;;;;;;WACnB,wBAAqC;AACnC,iBAII,KAAKC,KAAL,CAAWC,cAAX,EAJJ;AAAA,UACEC,OADF,QACEA,OADF;AAAA,UAEEC,QAFF,QAEEA,QAFF;AAAA,UAGEC,KAHF,QAGEA,KAHF;;AAKA,aAAO;AACLC,QAAAA,SAAS,EAAEH,OAAO,IAAI,GADjB;AAELI,QAAAA,UAAU,EAAEH,QAAQ,IAAI,GAFnB;AAGLI,QAAAA,OAAO,EAAEH,KAAK,IAAI,CAHb;AAILI,QAAAA,QAAQ,EAAE,CACR,KAAKR,KAAL,CAAWS,SAAX,GAAuBC,IAAvB,CAA4BC,OADpB,EAER,KAAKX,KAAL,CAAWS,SAAX,GAAuBC,IAAvB,CAA4BE,OAFpB;AAJL,OAAP;AASD;;;WAED,sBAA8B;AAC5B,aAAO,KAAKC,WAAL,EAAP;AACD;;;WAED,uBAA+B;AAC7B,kBAGI,KAAKb,KAAL,CAAWC,cAAX,EAHJ;AAAA,6BACEa,IADF;AAAA,UACEA,IADF,2BACS,KADT;AAAA,mCAEEC,UAFF;AAAA,UAEEA,UAFF,iCAEe,IAFf;;AAIA,aAAO,CACL,KAAKf,KAAL,CAAWgB,eAAX,CAA2B;AACzBC,QAAAA,UAAU,EAAE,gBADa;AAEzBC,QAAAA,YAAY,EAAEC,eAFW;AAGzBC,QAAAA,cAAc,EAAEC,eAHS;AAIzBC,QAAAA,aAAa,EAAExB,wBAJU;AAKzByB,QAAAA,KAAK,EAAE;AAAEC,UAAAA,MAAM,EAAE;AAAV,SALkB;AAMzBC,QAAAA,SAAS,EAAE9B,EAAE,CAAC+B,SANW;AAOzBC,QAAAA,KAAK,EAAE,KAAKC,QAAL,EAPkB;AAQzBC,QAAAA,OAAO,EAAEjC,OAAO,CAACkB,IAAD,EAAOC,UAAP;AARS,OAA3B,CADK,CAAP;AAYD;;;WACD,qCAAsC;AACpC,WAAKe,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,QAAAA,IAAI,EAAE,KAD0C;AAEhDC,QAAAA,IAAI,EAAEvC,aAAa,CAACwC,SAF4B;AAGhDC,QAAAA,UAAU,EAAE;AACVH,UAAAA,IAAI,EAAE,OADI;AAEVI,UAAAA,MAAM,EAAE;AAENC,YAAAA,KAAK,EAAE1C,EAAE,CAAC2C,YAFJ;AAGN5B,YAAAA,IAAI,EAAE,EAHA;AAINuB,YAAAA,IAAI,EAAEtC,EAAE,CAAC4C;AAJH,WAFE;AAQVC,UAAAA,IAAI,EAAE,CARI;AASVC,UAAAA,MAAM,EAAE,gBAACC,OAAD,EAA0BC,UAA1B,EAAiD;AAEvD,gBAAMC,WAAW,GAAIF,OAAO,CAACG,OAAR,KAAoB,UAApB,GACjBH,OAAO,CAACI,iBADS,GAEjBJ,OAAO,CAACE,WAFZ;AAKA,mBAAO,CAACA,WAAW,CAAC,CAAD,CAAZ,EAAiBA,WAAW,CAAC,CAAD,CAA5B,EAAiC,CAAjC,CAAP;AACD;AAjBS;AAHoC,OAAlD;AAuBD;;;;EAhEuC/C,S;;SAArBE,Y","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n} from '@antv/l7-core';\nimport { getMask } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IHeatMapLayerStyleOptions } from '../../core/interface';\nimport { HeatmapGridTriangulation } from '../../core/triangulation';\nimport heatmapGridFrag from '../shaders/hexagon_frag.glsl';\nimport heatmapGridVert from '../shaders/hexagon_vert.glsl';\n\nexport default class HexagonModel extends BaseModel {\n  public getUninforms(): IModelUniform {\n    const {\n      opacity,\n      coverage,\n      angle,\n    } = this.layer.getLayerConfig() as IHeatMapLayerStyleOptions;\n    return {\n      u_opacity: opacity || 1.0,\n      u_coverage: coverage || 0.9,\n      u_angle: angle || 0,\n      u_radius: [\n        this.layer.getSource().data.xOffset,\n        this.layer.getSource().data.yOffset,\n      ],\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 IHeatMapLayerStyleOptions;\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'hexagonheatmap',\n        vertexShader: heatmapGridVert,\n        fragmentShader: heatmapGridFrag,\n        triangulation: HeatmapGridTriangulation,\n        depth: { enable: false },\n        primitive: gl.TRIANGLES,\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      }),\n    ];\n  }\n  protected registerBuiltinAttributes() {\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'pos', // 顶点经纬度位置\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Pos',\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: 3,\n        update: (feature: IEncodeFeature, featureIdx: number) => {\n          // const coordinates = (feature.verison==='GAODE2.x'?feature.originoordinates:feature.coordinates) as number[];\n          const coordinates = (feature.version === 'GAODE2.x'\n            ? feature.originCoordinates\n            : feature.coordinates) as number[];\n          // const coordinates = feature.coordinates as number[];\n          // const coordinates = feature.originCoordinates as number[];\n          return [coordinates[0], coordinates[1], 0];\n        },\n      },\n    });\n  }\n}\n"],"file":"hexagon.js"}

package/es/image/index.d.ts

@@ -14,6 +14,6 @@ export default class ImageLayer extends BaseLayer<IImageLayerStyleOptions> {
             };
         };
     };
-    protected getDefaultConfig(): {};
+    protected getDefaultConfig(): {} | {};
     protected getModelType(): ImageModelType;
 }

package/es/image/index.js

@@ -37,24 +37,14 @@ var ImageLayer = function (_BaseLayer) {
   _createClass(ImageLayer, [{
     key: "buildModels",
     value: function buildModels() {
-      var _this2 = this;
-
       var modelType = this.getModelType();
       this.layerModel = new ImageModels[modelType](this);
-      this.layerModel.initModels(function (models) {
-        _this2.models = models;
-
-        _this2.renderLayers();
-      });
+      this.models = this.layerModel.initModels();
     }
   }, {
     key: "rebuildModels",
     value: function rebuildModels() {
-      var _this3 = this;
-
-      this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
-      });
+      this.models = this.layerModel.buildModels();
     }
   }, {
     key: "getConfigSchema",
@@ -74,14 +64,26 @@ var ImageLayer = function (_BaseLayer) {
     value: function getDefaultConfig() {
       var type = this.getModelType();
       var defaultConfig = {
-        image: {}
+        image: {},
+        dataImage: {}
       };
       return defaultConfig[type];
     }
   }, {
     key: "getModelType",
     value: function getModelType() {
-      return 'image';
+      var _shapeAttribute$scale;
+
+      var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
+      var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
+
+      if (shape === 'dataImage') {
+        return 'dataImage';
+      } else if (shape === 'image') {
+        return 'image';
+      } else {
+        return 'image';
+      }
     }
   }]);
 

package/es/image/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/image/index.ts"],"names":["BaseLayer","ImageModels","ImageLayer","modelType","getModelType","layerModel","initModels","models","renderLayers","buildModels","properties","opacity","type","minimum","maximum","defaultConfig","image"],"mappings":";;;;;;;;;;;;AAAA,OAAOA,SAAP,MAAsB,mBAAtB;AAEA,OAAOC,WAAP,MAA4C,gBAA5C;;IACqBC,U;;;;;;;;;;;;;;;;2DACG,Y;;;;;;;WACtB,uBAAqB;AAAA;;AACnB,UAAMC,SAAS,GAAG,KAAKC,YAAL,EAAlB;AACA,WAAKC,UAAL,GAAkB,IAAIJ,WAAW,CAACE,SAAD,CAAf,CAA2B,IAA3B,CAAlB;AACA,WAAKE,UAAL,CAAgBC,UAAhB,CAA2B,UAACC,MAAD,EAAY;AACrC,QAAA,MAAI,CAACA,MAAL,GAAcA,MAAd;;AACA,QAAA,MAAI,CAACC,YAAL;AACD,OAHD;AAID;;;WACD,yBAAuB;AAAA;;AACrB,WAAKH,UAAL,CAAgBI,WAAhB,CAA4B,UAACF,MAAD;AAAA,eAAa,MAAI,CAACA,MAAL,GAAcA,MAA3B;AAAA,OAA5B;AACD;;;WACD,2BAA4B;AAC1B,aAAO;AACLG,QAAAA,UAAU,EAAE;AACVC,UAAAA,OAAO,EAAE;AACPC,YAAAA,IAAI,EAAE,QADC;AAEPC,YAAAA,OAAO,EAAE,CAFF;AAGPC,YAAAA,OAAO,EAAE;AAHF;AADC;AADP,OAAP;AASD;;;WACD,4BAA6B;AAC3B,UAAMF,IAAI,GAAG,KAAKR,YAAL,EAAb;AACA,UAAMW,aAAa,GAAG;AACpBC,QAAAA,KAAK,EAAE;AADa,OAAtB;AAGA,aAAOD,aAAa,CAACH,IAAD,CAApB;AACD;;;WAED,wBAAyC;AACvC,aAAO,OAAP;AACD;;;;EAlCqCZ,S;;SAAnBE,U","sourcesContent":["import BaseLayer from '../core/BaseLayer';\nimport { IImageLayerStyleOptions } from '../core/interface';\nimport ImageModels, { ImageModelType } from './models/index';\nexport default class ImageLayer extends BaseLayer<IImageLayerStyleOptions> {\n  public type: string = 'ImageLayer';\n  public buildModels() {\n    const modelType = this.getModelType();\n    this.layerModel = new ImageModels[modelType](this);\n    this.layerModel.initModels((models) => {\n      this.models = models;\n      this.renderLayers();\n    });\n  }\n  public rebuildModels() {\n    this.layerModel.buildModels((models) => (this.models = models));\n  }\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n  protected getDefaultConfig() {\n    const type = this.getModelType();\n    const defaultConfig = {\n      image: {},\n    };\n    return defaultConfig[type];\n  }\n\n  protected getModelType(): ImageModelType {\n    return 'image';\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/image/index.ts"],"names":["BaseLayer","ImageModels","ImageLayer","modelType","getModelType","layerModel","models","initModels","buildModels","properties","opacity","type","minimum","maximum","defaultConfig","image","dataImage","shapeAttribute","styleAttributeService","getLayerStyleAttribute","shape","scale","field"],"mappings":";;;;;;;;;;;;AAAA,OAAOA,SAAP,MAAsB,mBAAtB;AAEA,OAAOC,WAAP,MAA4C,gBAA5C;;IACqBC,U;;;;;;;;;;;;;;;;2DACG,Y;;;;;;;WACtB,uBAAqB;AACnB,UAAMC,SAAS,GAAG,KAAKC,YAAL,EAAlB;AACA,WAAKC,UAAL,GAAkB,IAAIJ,WAAW,CAACE,SAAD,CAAf,CAA2B,IAA3B,CAAlB;AACA,WAAKG,MAAL,GAAc,KAAKD,UAAL,CAAgBE,UAAhB,EAAd;AACD;;;WACD,yBAAuB;AACrB,WAAKD,MAAL,GAAc,KAAKD,UAAL,CAAgBG,WAAhB,EAAd;AACD;;;WACD,2BAA4B;AAC1B,aAAO;AACLC,QAAAA,UAAU,EAAE;AACVC,UAAAA,OAAO,EAAE;AACPC,YAAAA,IAAI,EAAE,QADC;AAEPC,YAAAA,OAAO,EAAE,CAFF;AAGPC,YAAAA,OAAO,EAAE;AAHF;AADC;AADP,OAAP;AASD;;;WACD,4BAA6B;AAC3B,UAAMF,IAAI,GAAG,KAAKP,YAAL,EAAb;AACA,UAAMU,aAAa,GAAG;AACpBC,QAAAA,KAAK,EAAE,EADa;AAEpBC,QAAAA,SAAS,EAAE;AAFS,OAAtB;AAIA,aAAOF,aAAa,CAACH,IAAD,CAApB;AACD;;;WAED,wBAAyC;AAAA;;AACvC,UAAMM,cAAc,GAAG,KAAKC,qBAAL,CAA2BC,sBAA3B,CACrB,OADqB,CAAvB;AAGA,UAAMC,KAAK,GAAGH,cAAH,aAAGA,cAAH,gDAAGA,cAAc,CAAEI,KAAnB,0DAAG,sBAAuBC,KAArC;;AACA,UAAIF,KAAK,KAAK,WAAd,EAA2B;AACzB,eAAO,WAAP;AACD,OAFD,MAEO,IAAIA,KAAK,KAAK,OAAd,EAAuB;AAC5B,eAAO,OAAP;AACD,OAFM,MAEA;AACL,eAAO,OAAP;AACD;AACF;;;;EA1CqCpB,S;;SAAnBE,U","sourcesContent":["import BaseLayer from '../core/BaseLayer';\nimport { IImageLayerStyleOptions } from '../core/interface';\nimport ImageModels, { ImageModelType } from './models/index';\nexport default class ImageLayer extends BaseLayer<IImageLayerStyleOptions> {\n  public type: string = 'ImageLayer';\n  public buildModels() {\n    const modelType = this.getModelType();\n    this.layerModel = new ImageModels[modelType](this);\n    this.models = this.layerModel.initModels();\n  }\n  public rebuildModels() {\n    this.models = this.layerModel.buildModels();\n  }\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n  protected getDefaultConfig() {\n    const type = this.getModelType();\n    const defaultConfig = {\n      image: {},\n      dataImage: {},\n    };\n    return defaultConfig[type];\n  }\n\n  protected getModelType(): ImageModelType {\n    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute(\n      'shape',\n    );\n    const shape = shapeAttribute?.scale?.field as ImageModelType;\n    if (shape === 'dataImage') {\n      return 'dataImage';\n    } else if (shape === 'image') {\n      return 'image';\n    } else {\n      return 'image';\n    }\n  }\n}\n"],"file":"index.js"}

package/es/image/models/dataImage.d.ts

@@ -0,0 +1,22 @@
+import { IModelUniform, ITexture2D } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class ImageDataModel extends BaseModel {
+    protected texture: ITexture2D;
+    protected colorTexture: ITexture2D;
+    private rampColors;
+    getUninforms(): IModelUniform;
+    initModels(): import("@antv/l7-core").IModel[];
+    clearModels(): void;
+    buildModels(): import("@antv/l7-core").IModel[];
+    protected getConfigSchema(): {
+        properties: {
+            opacity: {
+                type: string;
+                minimum: number;
+                maximum: number;
+            };
+        };
+    };
+    protected registerBuiltinAttributes(): void;
+    private updateColorTexure;
+}

package/es/image/models/dataImage.js

@@ -0,0 +1,230 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _isEqual from "lodash/isEqual";
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+import { AttributeType, gl } from '@antv/l7-core';
+import { generateColorRamp, getMask, isMini } from '@antv/l7-utils';
+import BaseModel from '../../core/BaseModel';
+import { RasterImageTriangulation } from '../../core/triangulation';
+var ImageFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nvarying vec2 v_texCoord;\n\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\n\nuniform float u_pixelConstant;\nuniform float u_pixelConstantR;\nuniform float u_pixelConstantG;\nuniform float u_pixelConstantB;\nuniform float u_pixelConstantRGB;\n\nvoid main() {\n  vec4 baseColor = texture2D(u_texture, vec2(v_texCoord.x, v_texCoord.y));\n\n  float r = baseColor.r;\n  float g = baseColor.g;\n  float b = baseColor.b;\n\n  float value = u_pixelConstant + ((r * u_pixelConstantR + g * u_pixelConstantG + b * u_pixelConstantB) * u_pixelConstantRGB);\n  if (value == u_noDataValue) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {\n    gl_FragColor = vec4(0, 0, 0, 0);\n  } else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec4 color = texture2D(u_colorTexture, vec2(normalisedValue, 0));\n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n  }\n}\n";
+var ImageVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
+
+var ImageDataModel = function (_BaseModel) {
+  _inherits(ImageDataModel, _BaseModel);
+
+  var _super = _createSuper(ImageDataModel);
+
+  function ImageDataModel() {
+    var _this;
+
+    _classCallCheck(this, ImageDataModel);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+
+    _defineProperty(_assertThisInitialized(_this), "texture", void 0);
+
+    _defineProperty(_assertThisInitialized(_this), "colorTexture", void 0);
+
+    _defineProperty(_assertThisInitialized(_this), "rampColors", void 0);
+
+    return _this;
+  }
+
+  _createClass(ImageDataModel, [{
+    key: "getUninforms",
+    value: function getUninforms() {
+      var _ref = this.layer.getLayerConfig(),
+          opacity = _ref.opacity,
+          _ref$clampLow = _ref.clampLow,
+          clampLow = _ref$clampLow === void 0 ? true : _ref$clampLow,
+          _ref$clampHigh = _ref.clampHigh,
+          clampHigh = _ref$clampHigh === void 0 ? true : _ref$clampHigh,
+          _ref$noDataValue = _ref.noDataValue,
+          noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
+          _ref$domain = _ref.domain,
+          domain = _ref$domain === void 0 ? [0, 1] : _ref$domain,
+          rampColors = _ref.rampColors,
+          _ref$pixelConstant = _ref.pixelConstant,
+          pixelConstant = _ref$pixelConstant === void 0 ? 0.0 : _ref$pixelConstant,
+          _ref$pixelConstantR = _ref.pixelConstantR,
+          pixelConstantR = _ref$pixelConstantR === void 0 ? 256 * 256 : _ref$pixelConstantR,
+          _ref$pixelConstantG = _ref.pixelConstantG,
+          pixelConstantG = _ref$pixelConstantG === void 0 ? 256 : _ref$pixelConstantG,
+          _ref$pixelConstantB = _ref.pixelConstantB,
+          pixelConstantB = _ref$pixelConstantB === void 0 ? 1 : _ref$pixelConstantB,
+          _ref$pixelConstantRGB = _ref.pixelConstantRGB,
+          pixelConstantRGB = _ref$pixelConstantRGB === void 0 ? 0.1 : _ref$pixelConstantRGB;
+
+      if (!_isEqual(this.rampColors, rampColors)) {
+        this.updateColorTexure();
+        this.rampColors = rampColors;
+      }
+
+      return {
+        u_opacity: opacity || 1,
+        u_texture: this.texture,
+        u_pixelConstant: pixelConstant,
+        u_pixelConstantR: pixelConstantR,
+        u_pixelConstantG: pixelConstantG,
+        u_pixelConstantB: pixelConstantB,
+        u_pixelConstantRGB: pixelConstantRGB,
+        u_domain: domain,
+        u_clampLow: clampLow,
+        u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,
+        u_noDataValue: noDataValue,
+        u_colorTexture: this.colorTexture
+      };
+    }
+  }, {
+    key: "initModels",
+    value: function initModels() {
+      var _this2 = this;
+
+      var _ref2 = this.layer.getLayerConfig(),
+          _ref2$mask = _ref2.mask,
+          mask = _ref2$mask === void 0 ? false : _ref2$mask,
+          _ref2$maskInside = _ref2.maskInside,
+          maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside,
+          rampColorsData = _ref2.rampColorsData,
+          rampColors = _ref2.rampColors;
+
+      var source = this.layer.getSource();
+      var createTexture2D = this.rendererService.createTexture2D;
+      this.texture = createTexture2D({
+        height: 0,
+        width: 0
+      });
+
+      if (isMini) {
+        var canvas = this.layerService.sceneService.getSceneConfig().canvas;
+        var img = canvas.createImage();
+        img.crossOrigin = 'anonymous';
+        img.src = source.data.originData;
+
+        img.onload = function () {
+          _this2.texture = createTexture2D({
+            data: img,
+            width: img.width,
+            height: img.height
+          });
+
+          _this2.layerService.updateLayerRenderList();
+
+          _this2.layerService.renderLayers();
+        };
+      } else {
+        source.data.images.then(function (imageData) {
+          _this2.texture = createTexture2D({
+            data: imageData[0],
+            width: imageData[0].width,
+            height: imageData[0].height
+          });
+
+          _this2.layerService.updateLayerRenderList();
+
+          _this2.layerService.renderLayers();
+        });
+      }
+
+      var rampImageData = rampColorsData ? rampColorsData : generateColorRamp(rampColors);
+      this.colorTexture = createTexture2D({
+        data: rampImageData.data,
+        width: rampImageData.width,
+        height: rampImageData.height,
+        flipY: false
+      });
+      return [this.layer.buildLayerModel({
+        moduleName: 'RasterImage',
+        vertexShader: ImageVert,
+        fragmentShader: ImageFrag,
+        triangulation: RasterImageTriangulation,
+        primitive: gl.TRIANGLES,
+        depth: {
+          enable: false
+        },
+        blend: this.getBlend(),
+        stencil: getMask(mask, maskInside)
+      })];
+    }
+  }, {
+    key: "clearModels",
+    value: function clearModels() {
+      var _this$texture, _this$colorTexture;
+
+      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
+    }
+  }, {
+    key: "buildModels",
+    value: function buildModels() {
+      return this.initModels();
+    }
+  }, {
+    key: "getConfigSchema",
+    value: function getConfigSchema() {
+      return {
+        properties: {
+          opacity: {
+            type: 'number',
+            minimum: 0,
+            maximum: 1
+          }
+        }
+      };
+    }
+  }, {
+    key: "registerBuiltinAttributes",
+    value: function registerBuiltinAttributes() {
+      this.styleAttributeService.registerStyleAttribute({
+        name: 'uv',
+        type: AttributeType.Attribute,
+        descriptor: {
+          name: 'a_Uv',
+          buffer: {
+            usage: gl.DYNAMIC_DRAW,
+            data: [],
+            type: gl.FLOAT
+          },
+          size: 2,
+          update: function update(feature, featureIdx, vertex, attributeIdx) {
+            return [vertex[3], vertex[4]];
+          }
+        }
+      });
+    }
+  }, {
+    key: "updateColorTexure",
+    value: function updateColorTexure() {
+      var createTexture2D = this.rendererService.createTexture2D;
+
+      var _ref3 = this.layer.getLayerConfig(),
+          rampColors = _ref3.rampColors;
+
+      var imageData = generateColorRamp(rampColors);
+      this.colorTexture = createTexture2D({
+        data: imageData.data,
+        width: imageData.width,
+        height: imageData.height,
+        flipY: false
+      });
+    }
+  }]);
+
+  return ImageDataModel;
+}(BaseModel);
+
+export { ImageDataModel as default };
+//# sourceMappingURL=dataImage.js.map

package/es/image/models/dataImage.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/image/models/dataImage.ts"],"names":["AttributeType","gl","generateColorRamp","getMask","isMini","BaseModel","RasterImageTriangulation","ImageDataModel","layer","getLayerConfig","opacity","clampLow","clampHigh","noDataValue","domain","rampColors","pixelConstant","pixelConstantR","pixelConstantG","pixelConstantB","pixelConstantRGB","updateColorTexure","u_opacity","u_texture","texture","u_pixelConstant","u_pixelConstantR","u_pixelConstantG","u_pixelConstantB","u_pixelConstantRGB","u_domain","u_clampLow","u_clampHigh","u_noDataValue","u_colorTexture","colorTexture","mask","maskInside","rampColorsData","source","getSource","createTexture2D","rendererService","height","width","canvas","layerService","sceneService","getSceneConfig","img","createImage","crossOrigin","src","data","originData","onload","updateLayerRenderList","renderLayers","images","then","imageData","rampImageData","flipY","buildLayerModel","moduleName","vertexShader","ImageVert","fragmentShader","ImageFrag","triangulation","primitive","TRIANGLES","depth","enable","blend","getBlend","stencil","destroy","initModels","properties","type","minimum","maximum","styleAttributeService","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","size","update","feature","featureIdx","vertex","attributeIdx"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  IModelUniform,\n  ITexture2D,\n} from '@antv/l7-core';\nimport { generateColorRamp, getMask, IColorRamp, isMini } from '@antv/l7-utils';\nimport { isEqual } from 'lodash';\nimport BaseModel from '../../core/BaseModel';\nimport { IImageLayerStyleOptions } from '../../core/interface';\nimport { RasterImageTriangulation } from '../../core/triangulation';\nimport ImageFrag from '../shaders/dataImage_frag.glsl';\nimport ImageVert from '../shaders/image_vert.glsl';\n\nexport default class ImageDataModel extends BaseModel {\n  protected texture: ITexture2D;\n  protected colorTexture: ITexture2D;\n  private rampColors: any;\n  public getUninforms(): IModelUniform {\n    const {\n      opacity,\n      clampLow = true,\n      clampHigh = true,\n      noDataValue = -9999999,\n      domain = [0, 1],\n      rampColors,\n\n      pixelConstant = 0.0,\n      pixelConstantR = 256 * 256,\n      pixelConstantG = 256,\n      pixelConstantB = 1,\n      pixelConstantRGB = 0.1,\n    } = this.layer.getLayerConfig() as IImageLayerStyleOptions;\n\n    if (!isEqual(this.rampColors, rampColors)) {\n      this.updateColorTexure();\n      this.rampColors = rampColors;\n    }\n    return {\n      u_opacity: opacity || 1,\n      u_texture: this.texture,\n\n      u_pixelConstant: pixelConstant,\n      u_pixelConstantR: pixelConstantR,\n      u_pixelConstantG: pixelConstantG,\n      u_pixelConstantB: pixelConstantB,\n      u_pixelConstantRGB: pixelConstantRGB,\n\n      u_domain: domain,\n      u_clampLow: clampLow,\n      u_clampHigh: typeof clampHigh !== 'undefined' ? clampHigh : clampLow,\n      u_noDataValue: noDataValue,\n      u_colorTexture: this.colorTexture,\n    };\n  }\n  public initModels() {\n    const {\n      mask = false,\n      maskInside = true,\n      rampColorsData,\n      rampColors,\n    } = this.layer.getLayerConfig() as IImageLayerStyleOptions;\n\n    const source = this.layer.getSource();\n    const { createTexture2D } = this.rendererService;\n    this.texture = createTexture2D({\n      height: 0,\n      width: 0,\n    });\n\n    if (isMini) {\n      // @ts-ignore\n      const canvas = this.layerService.sceneService.getSceneConfig().canvas;\n      const img = canvas.createImage();\n      img.crossOrigin = 'anonymous';\n      img.src = source.data.originData;\n\n      img.onload = () => {\n        this.texture = createTexture2D({\n          data: img,\n          width: img.width,\n          height: img.height,\n        });\n        this.layerService.updateLayerRenderList();\n        this.layerService.renderLayers();\n      };\n    } else {\n      source.data.images.then(\n        (imageData: Array<HTMLImageElement | ImageBitmap>) => {\n          this.texture = createTexture2D({\n            data: imageData[0],\n            width: imageData[0].width,\n            height: imageData[0].height,\n          });\n          this.layerService.updateLayerRenderList();\n          this.layerService.renderLayers();\n        },\n      );\n    }\n\n    const rampImageData = rampColorsData\n      ? rampColorsData\n      : generateColorRamp(rampColors as IColorRamp);\n    this.colorTexture = createTexture2D({\n      data: rampImageData.data,\n      width: rampImageData.width,\n      height: rampImageData.height,\n      flipY: false,\n    });\n\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'RasterImage',\n        vertexShader: ImageVert,\n        fragmentShader: ImageFrag,\n        triangulation: RasterImageTriangulation,\n        primitive: gl.TRIANGLES,\n        depth: { enable: false },\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      }),\n    ];\n  }\n\n  public clearModels(): void {\n    this.texture?.destroy();\n    this.colorTexture?.destroy();\n  }\n\n  public buildModels() {\n    return this.initModels();\n  }\n\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n\n  protected registerBuiltinAttributes() {\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'uv',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Uv',\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: 2,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          return [vertex[3], vertex[4]];\n        },\n      },\n    });\n  }\n\n  private updateColorTexure() {\n    const { createTexture2D } = this.rendererService;\n    const {\n      rampColors,\n    } = this.layer.getLayerConfig() as IImageLayerStyleOptions;\n    const imageData = generateColorRamp(rampColors as IColorRamp);\n    this.colorTexture = createTexture2D({\n      data: imageData.data,\n      width: imageData.width,\n      height: imageData.height,\n      flipY: false,\n    });\n  }\n}\n"],"file":"dataImage.js"}

package/es/image/models/image.d.ts

@@ -1,10 +1,11 @@
-import { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
+import { IModelUniform, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class ImageModel extends BaseModel {
     protected texture: ITexture2D;
     getUninforms(): IModelUniform;
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): void;
+    initModels(): import("@antv/l7-core").IModel[];
+    clearModels(): void;
+    buildModels(): import("@antv/l7-core").IModel[];
     protected getConfigSchema(): {
         properties: {
             opacity: {

package/es/image/models/image.js

@@ -51,7 +51,7 @@ var ImageModel = function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels(callbackModel) {
+    value: function initModels() {
       var _this2 = this;
 
       var _ref2 = this.layer.getLayerConfig(),
@@ -98,8 +98,8 @@ var ImageModel = function (_BaseModel) {
         });
       }
 
-      this.layer.buildLayerModel({
-        moduleName: 'rasterImage',
+      return [this.layer.buildLayerModel({
+        moduleName: 'RasterImage',
         vertexShader: ImageVert,
         fragmentShader: ImageFrag,
         triangulation: RasterImageTriangulation,
@@ -107,18 +107,21 @@ var ImageModel = function (_BaseModel) {
         depth: {
           enable: false
         },
+        blend: this.getBlend(),
         stencil: getMask(mask, maskInside)
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
+      })];
+    }
+  }, {
+    key: "clearModels",
+    value: function clearModels() {
+      var _this$texture;
+
+      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
     }
   }, {
     key: "buildModels",
-    value: function buildModels(callbackModel) {
-      return this.initModels(callbackModel);
+    value: function buildModels() {
+      return this.initModels();
     }
   }, {
     key: "getConfigSchema",

package/es/image/models/image.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/image/models/image.ts"],"names":["AttributeType","gl","getMask","isMini","BaseModel","RasterImageTriangulation","ImageModel","layer","getLayerConfig","opacity","u_opacity","u_texture","texture","callbackModel","mask","maskInside","source","getSource","createTexture2D","rendererService","height","width","canvas","layerService","sceneService","getSceneConfig","img","createImage","crossOrigin","src","data","originData","onload","updateLayerRenderList","renderLayers","images","then","imageData","buildLayerModel","moduleName","vertexShader","ImageVert","fragmentShader","ImageFrag","triangulation","primitive","TRIANGLES","depth","enable","stencil","model","catch","err","console","warn","initModels","properties","type","minimum","maximum","styleAttributeService","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","size","update","feature","featureIdx","vertex","attributeIdx"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  IModel,\n  IModelUniform,\n  ITexture2D,\n} from '@antv/l7-core';\nimport { getMask, isMini } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IImageLayerStyleOptions } from '../../core/interface';\nimport { RasterImageTriangulation } from '../../core/triangulation';\nimport ImageFrag from '../shaders/image_frag.glsl';\nimport ImageVert from '../shaders/image_vert.glsl';\n\nexport default class ImageModel extends BaseModel {\n  protected texture: ITexture2D;\n  public getUninforms(): IModelUniform {\n    const { opacity } = this.layer.getLayerConfig() as IImageLayerStyleOptions;\n    return {\n      u_opacity: opacity || 1,\n      u_texture: this.texture,\n    };\n  }\n\n  public initModels(callbackModel: (models: IModel[]) => void) {\n    const {\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IImageLayerStyleOptions;\n\n    const source = this.layer.getSource();\n    const { createTexture2D } = this.rendererService;\n    this.texture = createTexture2D({\n      height: 0,\n      width: 0,\n    });\n\n    if (isMini) {\n      // @ts-ignore\n      const canvas = this.layerService.sceneService.getSceneConfig().canvas;\n      const img = canvas.createImage();\n      img.crossOrigin = 'anonymous';\n      img.src = source.data.originData;\n\n      img.onload = () => {\n        this.texture = createTexture2D({\n          data: img,\n          width: img.width,\n          height: img.height,\n        });\n        this.layerService.updateLayerRenderList();\n        this.layerService.renderLayers();\n      };\n    } else {\n      source.data.images.then(\n        (imageData: Array<HTMLImageElement | ImageBitmap>) => {\n          this.texture = createTexture2D({\n            data: imageData[0],\n            width: imageData[0].width,\n            height: imageData[0].height,\n          });\n          this.layerService.updateLayerRenderList();\n          this.layerService.renderLayers();\n        },\n      );\n    }\n\n    this.layer\n      .buildLayerModel({\n        moduleName: 'rasterImage',\n        vertexShader: ImageVert,\n        fragmentShader: ImageFrag,\n        triangulation: RasterImageTriangulation,\n        primitive: gl.TRIANGLES,\n        depth: { enable: false },\n        stencil: getMask(mask, maskInside),\n      })\n      .then((model) => {\n        callbackModel([model]);\n      })\n      .catch((err) => {\n        console.warn(err);\n        callbackModel([]);\n      });\n  }\n\n  public buildModels(callbackModel: (models: IModel[]) => void) {\n    return this.initModels(callbackModel);\n  }\n\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n\n  protected registerBuiltinAttributes() {\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'uv',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Uv',\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: 2,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          return [vertex[3], vertex[4]];\n        },\n      },\n    });\n  }\n}\n"],"file":"image.js"}
+{"version":3,"sources":["../../../src/image/models/image.ts"],"names":["AttributeType","gl","getMask","isMini","BaseModel","RasterImageTriangulation","ImageModel","layer","getLayerConfig","opacity","u_opacity","u_texture","texture","mask","maskInside","source","getSource","createTexture2D","rendererService","height","width","canvas","layerService","sceneService","getSceneConfig","img","createImage","crossOrigin","src","data","originData","onload","updateLayerRenderList","renderLayers","images","then","imageData","buildLayerModel","moduleName","vertexShader","ImageVert","fragmentShader","ImageFrag","triangulation","primitive","TRIANGLES","depth","enable","blend","getBlend","stencil","destroy","initModels","properties","type","minimum","maximum","styleAttributeService","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","FLOAT","size","update","feature","featureIdx","vertex","attributeIdx"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  IModelUniform,\n  ITexture2D,\n} from '@antv/l7-core';\nimport { getMask, isMini } from '@antv/l7-utils';\nimport BaseModel from '../../core/BaseModel';\nimport { IImageLayerStyleOptions } from '../../core/interface';\nimport { RasterImageTriangulation } from '../../core/triangulation';\nimport ImageFrag from '../shaders/image_frag.glsl';\nimport ImageVert from '../shaders/image_vert.glsl';\n\nexport default class ImageModel extends BaseModel {\n  protected texture: ITexture2D;\n  public getUninforms(): IModelUniform {\n    const { opacity } = this.layer.getLayerConfig() as IImageLayerStyleOptions;\n    return {\n      u_opacity: opacity || 1,\n      u_texture: this.texture,\n    };\n  }\n  public initModels() {\n    const {\n      mask = false,\n      maskInside = true,\n    } = this.layer.getLayerConfig() as IImageLayerStyleOptions;\n\n    const source = this.layer.getSource();\n    const { createTexture2D } = this.rendererService;\n    this.texture = createTexture2D({\n      height: 0,\n      width: 0,\n    });\n\n    if (isMini) {\n      // @ts-ignore\n      const canvas = this.layerService.sceneService.getSceneConfig().canvas;\n      const img = canvas.createImage();\n      img.crossOrigin = 'anonymous';\n      img.src = source.data.originData;\n\n      img.onload = () => {\n        this.texture = createTexture2D({\n          data: img,\n          width: img.width,\n          height: img.height,\n        });\n        this.layerService.updateLayerRenderList();\n        this.layerService.renderLayers();\n      };\n    } else {\n      source.data.images.then(\n        (imageData: Array<HTMLImageElement | ImageBitmap>) => {\n          this.texture = createTexture2D({\n            data: imageData[0],\n            width: imageData[0].width,\n            height: imageData[0].height,\n          });\n          this.layerService.updateLayerRenderList();\n          this.layerService.renderLayers();\n        },\n      );\n    }\n\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'RasterImage',\n        vertexShader: ImageVert,\n        fragmentShader: ImageFrag,\n        triangulation: RasterImageTriangulation,\n        primitive: gl.TRIANGLES,\n        depth: { enable: false },\n        blend: this.getBlend(),\n        stencil: getMask(mask, maskInside),\n      }),\n    ];\n  }\n\n  public clearModels(): void {\n    this.texture?.destroy();\n  }\n\n  public buildModels() {\n    return this.initModels();\n  }\n\n  protected getConfigSchema() {\n    return {\n      properties: {\n        opacity: {\n          type: 'number',\n          minimum: 0,\n          maximum: 1,\n        },\n      },\n    };\n  }\n\n  protected registerBuiltinAttributes() {\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'uv',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Uv',\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: 2,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          return [vertex[3], vertex[4]];\n        },\n      },\n    });\n  }\n}\n"],"file":"image.js"}

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

@@ -1,4 +1,4 @@
-export declare type ImageModelType = 'image';
+export declare type ImageModelType = 'image' | 'dataImage';
 declare const ImageModels: {
     [key in ImageModelType]: any;
 };

package/es/image/models/index.js

@@ -1,6 +1,8 @@
+import DataImageModel from './dataImage';
 import ImageModel from './image';
 var ImageModels = {
-  image: ImageModel
+  image: ImageModel,
+  dataImage: DataImageModel
 };
 export default ImageModels;
 //# sourceMappingURL=index.js.map

package/es/image/models/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/image/models/index.ts"],"names":["ImageModel","ImageModels","image"],"mappings":"AAAA,OAAOA,UAAP,MAAuB,SAAvB;AAGA,IAAMC,WAA6C,GAAG;AACpDC,EAAAA,KAAK,EAAEF;AAD6C,CAAtD;AAIA,eAAeC,WAAf","sourcesContent":["import ImageModel from './image';\nexport type ImageModelType = 'image';\n\nconst ImageModels: { [key in ImageModelType]: any } = {\n  image: ImageModel,\n};\n\nexport default ImageModels;\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/image/models/index.ts"],"names":["DataImageModel","ImageModel","ImageModels","image","dataImage"],"mappings":"AAAA,OAAOA,cAAP,MAA2B,aAA3B;AACA,OAAOC,UAAP,MAAuB,SAAvB;AAGA,IAAMC,WAA6C,GAAG;AACpDC,EAAAA,KAAK,EAAEF,UAD6C;AAEpDG,EAAAA,SAAS,EAAEJ;AAFyC,CAAtD;AAKA,eAAeE,WAAf","sourcesContent":["import DataImageModel from './dataImage';\nimport ImageModel from './image';\nexport type ImageModelType = 'image' | 'dataImage';\n\nconst ImageModels: { [key in ImageModelType]: any } = {\n  image: ImageModel,\n  dataImage: DataImageModel,\n};\n\nexport default ImageModels;\n"],"file":"index.js"}

package/es/line/index.d.ts

@@ -20,6 +20,8 @@ export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
         blend: string;
     } | {
         blend: string;
+    } | {
+        blend: string;
     } | {} | {} | {} | {};
     protected getModelType(): LineModelType;
 }

package/es/line/index.js

@@ -37,24 +37,14 @@ var LineLayer = function (_BaseLayer) {
   _createClass(LineLayer, [{
     key: "buildModels",
     value: function buildModels() {
-      var _this2 = this;
-
       var shape = this.getModelType();
       this.layerModel = new LineModels[shape](this);
-      this.layerModel.initModels(function (models) {
-        _this2.models = models;
-
-        _this2.renderLayers();
-      });
+      this.models = this.layerModel.initModels();
     }
   }, {
     key: "rebuildModels",
     value: function rebuildModels() {
-      var _this3 = this;
-
-      this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
-      });
+      this.models = this.layerModel.buildModels();
     }
   }, {
     key: "getConfigSchema",
@@ -84,6 +74,9 @@ var LineLayer = function (_BaseLayer) {
         arc: {
           blend: 'additive'
         },
+        arcmini: {
+          blend: 'additive'
+        },
         greatcircle: {
           blend: 'additive'
         },