@antv/l7-layers 2.9.18 → 2.9.21

package/es/plugins/DataSourcePlugin.js

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _dec, _class;
 
 import { TYPES } from '@antv/l7-core';
-import Source, { DEFAULT_DATA, DEFAULT_PARSER } from '@antv/l7-source';
+import Source, { DEFAULT_DATA, DEFAULT_PARSER, DEFAULT_SOURCE } from '@antv/l7-source';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
 var DataSourcePlugin = (_dec = injectable(), _dec(_class = function () {
@@ -25,17 +25,26 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = function () {
         var source = layer.getSource();
 
         if (!source) {
-          var _ref = layer.sourceOption || {
+          var defaultSourceConfig = DEFAULT_SOURCE[layer.type] || {
             data: DEFAULT_DATA,
             options: DEFAULT_PARSER
-          },
+          };
+
+          var _ref = layer.sourceOption || defaultSourceConfig,
               data = _ref.data,
               options = _ref.options;
 
-          layer.setSource(new Source(data, options));
+          source = new Source(data, options);
+          layer.setSource(source);
         }
 
-        _this.updateClusterData(layer);
+        if (source.inited) {
+          _this.updateClusterData(layer);
+        } else {
+          source.once('sourceUpdate', function () {
+            _this.updateClusterData(layer);
+          });
+        }
       });
       layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
         var neeUpdateCluster = _this.updateClusterData(layer);

package/es/plugins/DataSourcePlugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/DataSourcePlugin.ts"],"names":["TYPES","Source","DEFAULT_DATA","DEFAULT_PARSER","injectable","DataSourcePlugin","layer","mapService","getContainer","get","IMapService","hooks","init","tap","source","getSource","sourceOption","data","options","setSource","updateClusterData","beforeRenderData","neeUpdateCluster","dataSourceNeedUpdate","dataState","cluster","clusterOptions","zoom","newZoom","getZoom","Math","floor","abs","clusterZoom"],"mappings":";;;;;;AAAA,SAKEA,KALF,QAMO,eANP;AAOA,OAAOC,MAAP,IAAiBC,YAAjB,EAA+BC,cAA/B,QAAqD,iBAArD;AACA,SAASC,UAAT,QAA2B,WAA3B;AACA,OAAO,kBAAP;IAGqBC,gB,WADpBD,UAAU,E;;;;;;;;;WAGT,eAAaE,KAAb,EAA4B;AAAA;;AAC1B,WAAKC,UAAL,GAAkBD,KAAK,CAACE,YAAN,GAAqBC,GAArB,CAAsCT,KAAK,CAACU,WAA5C,CAAlB;AACAJ,MAAAA,KAAK,CAACK,KAAN,CAAYC,IAAZ,CAAiBC,GAAjB,CAAqB,kBAArB,EAAyC,YAAM;AAC7C,YAAMC,MAAM,GAAGR,KAAK,CAACS,SAAN,EAAf;;AACA,YAAI,CAACD,MAAL,EAAa;AAEX,qBAA0BR,KAAK,CAACU,YAAN,IAAsB;AAC9CC,YAAAA,IAAI,EAAEf,YADwC;AAE9CgB,YAAAA,OAAO,EAAEf;AAFqC,WAAhD;AAAA,cAAQc,IAAR,QAAQA,IAAR;AAAA,cAAcC,OAAd,QAAcA,OAAd;;AAIAZ,UAAAA,KAAK,CAACa,SAAN,CAAgB,IAAIlB,MAAJ,CAAWgB,IAAX,EAAiBC,OAAjB,CAAhB;AACD;;AAED,QAAA,KAAI,CAACE,iBAAL,CAAuBd,KAAvB;AACD,OAZD;AAeAA,MAAAA,KAAK,CAACK,KAAN,CAAYU,gBAAZ,CAA6BR,GAA7B,CAAiC,kBAAjC,EAAqD,YAAM;AACzD,YAAMS,gBAAgB,GAAG,KAAI,CAACF,iBAAL,CAAuBd,KAAvB,CAAzB;;AACA,YAAMiB,oBAAoB,GAAGjB,KAAK,CAACkB,SAAN,CAAgBD,oBAA7C;AACAjB,QAAAA,KAAK,CAACkB,SAAN,CAAgBD,oBAAhB,GAAuC,KAAvC;AACA,eAAOD,gBAAgB,IAAIC,oBAA3B;AACD,OALD;AAMD;;;WAED,2BAA0BjB,KAA1B,EAAkD;AAChD,UAAMQ,MAAM,GAAGR,KAAK,CAACS,SAAN,EAAf;AACA,UAAMU,OAAO,GAAGX,MAAM,CAACW,OAAvB;AACA,kCAAqBX,MAAM,CAACY,cAA5B,CAAQC,IAAR;AAAA,UAAQA,IAAR,sCAAe,CAAf;AACA,UAAMC,OAAO,GAAG,KAAKrB,UAAL,CAAgBsB,OAAhB,KAA4B,CAA5C;AACA,UAAMN,oBAAoB,GAAGjB,KAAK,CAACkB,SAAN,CAAgBD,oBAA7C;;AACA,UAAIE,OAAO,IAAIF,oBAAf,EAAqC;AAEnCT,QAAAA,MAAM,CAACM,iBAAP,CAAyBU,IAAI,CAACC,KAAL,CAAWH,OAAX,CAAzB;AACD;;AAED,UAAIH,OAAO,IAAIK,IAAI,CAACE,GAAL,CAAS1B,KAAK,CAAC2B,WAAN,GAAoBL,OAA7B,KAAyC,CAAxD,EAA2D;AACzD,YAAID,IAAI,KAAKG,IAAI,CAACC,KAAL,CAAWH,OAAX,CAAb,EAAkC;AAChCd,UAAAA,MAAM,CAACM,iBAAP,CAAyBU,IAAI,CAACC,KAAL,CAAWH,OAAX,CAAzB;AACD;;AACDtB,QAAAA,KAAK,CAAC2B,WAAN,GAAoBL,OAApB;AACA,eAAO,IAAP;AACD;;AACD,aAAO,KAAP;AACD;;;;;SA9CkBvB,gB","sourcesContent":["import {\n  ILayer,\n  ILayerPlugin,\n  ILngLat,\n  IMapService,\n  TYPES,\n} from '@antv/l7-core';\nimport Source, { DEFAULT_DATA, DEFAULT_PARSER } from '@antv/l7-source';\nimport { injectable } from 'inversify';\nimport 'reflect-metadata';\n\n@injectable()\nexport default class DataSourcePlugin implements ILayerPlugin {\n  protected mapService: IMapService;\n  public apply(layer: ILayer) {\n    this.mapService = layer.getContainer().get<IMapService>(TYPES.IMapService);\n    layer.hooks.init.tap('DataSourcePlugin', () => {\n      const source = layer.getSource();\n      if (!source) {\n        // TODO: 允许用户不使用 layer 的 source 方法，在这里传入一个默认的替换的默认数据\n        const { data, options } = layer.sourceOption || {\n          data: DEFAULT_DATA,\n          options: DEFAULT_PARSER,\n        };\n        layer.setSource(new Source(data, options));\n      }\n\n      this.updateClusterData(layer);\n    });\n\n    // 检测数据是否需要更新\n    layer.hooks.beforeRenderData.tap('DataSourcePlugin', () => {\n      const neeUpdateCluster = this.updateClusterData(layer);\n      const dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;\n      layer.dataState.dataSourceNeedUpdate = false;\n      return neeUpdateCluster || dataSourceNeedUpdate;\n    });\n  }\n\n  private updateClusterData(layer: ILayer): boolean {\n    const source = layer.getSource();\n    const cluster = source.cluster;\n    const { zoom = 0 } = source.clusterOptions;\n    const newZoom = this.mapService.getZoom() - 1;\n    const dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;\n    if (cluster && dataSourceNeedUpdate) {\n      // 数据发生更新\n      source.updateClusterData(Math.floor(newZoom));\n    }\n    // 如果 dataSource 有更新，跳过 zoom 的判断，直接更新一次\n    if (cluster && Math.abs(layer.clusterZoom - newZoom) >= 1) {\n      if (zoom !== Math.floor(newZoom)) {\n        source.updateClusterData(Math.floor(newZoom));\n      }\n      layer.clusterZoom = newZoom;\n      return true;\n    }\n    return false;\n  }\n}\n"],"file":"DataSourcePlugin.js"}
+{"version":3,"sources":["../../src/plugins/DataSourcePlugin.ts"],"names":["TYPES","Source","DEFAULT_DATA","DEFAULT_PARSER","DEFAULT_SOURCE","injectable","DataSourcePlugin","layer","mapService","getContainer","get","IMapService","hooks","init","tap","source","getSource","defaultSourceConfig","type","data","options","sourceOption","setSource","inited","updateClusterData","once","beforeRenderData","neeUpdateCluster","dataSourceNeedUpdate","dataState","cluster","clusterOptions","zoom","newZoom","getZoom","Math","floor","abs","clusterZoom"],"mappings":"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","sourcesContent":["import {\n  ILayer,\n  ILayerPlugin,\n  ILngLat,\n  IMapService,\n  TYPES,\n} from '@antv/l7-core';\nimport Source, {\n  DEFAULT_DATA,\n  DEFAULT_PARSER,\n  DEFAULT_SOURCE,\n} from '@antv/l7-source';\nimport { injectable } from 'inversify';\nimport 'reflect-metadata';\n\n@injectable()\nexport default class DataSourcePlugin implements ILayerPlugin {\n  protected mapService: IMapService;\n  public apply(layer: ILayer) {\n    this.mapService = layer.getContainer().get<IMapService>(TYPES.IMapService);\n    layer.hooks.init.tap('DataSourcePlugin', () => {\n      let source = layer.getSource();\n      if (!source) {\n        // TODO: 允许用户不使用 layer 的 source 方法，在这里传入一个默认的替换的默认数据\n        const defaultSourceConfig = DEFAULT_SOURCE[\n          layer.type as 'PointLayer' | 'LineLayer'\n        ] || {\n          data: DEFAULT_DATA,\n          options: DEFAULT_PARSER,\n        };\n        const { data, options } = layer.sourceOption || defaultSourceConfig;\n        source = new Source(data, options);\n        layer.setSource(source);\n      }\n      if (source.inited) {\n        this.updateClusterData(layer);\n      } else {\n        source.once('sourceUpdate', () => {\n          this.updateClusterData(layer);\n          // TODO: layer.hooks.init.call();\n        });\n      }\n      // this.updateClusterData(layer);\n    });\n\n    // 检测数据是否需要更新\n    layer.hooks.beforeRenderData.tap('DataSourcePlugin', () => {\n      const neeUpdateCluster = this.updateClusterData(layer);\n      const dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;\n      layer.dataState.dataSourceNeedUpdate = false;\n      return neeUpdateCluster || dataSourceNeedUpdate;\n    });\n  }\n\n  private updateClusterData(layer: ILayer): boolean {\n    const source = layer.getSource();\n    const cluster = source.cluster;\n    const { zoom = 0 } = source.clusterOptions;\n    const newZoom = this.mapService.getZoom() - 1;\n    const dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;\n    if (cluster && dataSourceNeedUpdate) {\n      // 数据发生更新\n      source.updateClusterData(Math.floor(newZoom));\n    }\n    // 如果 dataSource 有更新，跳过 zoom 的判断，直接更新一次\n    if (cluster && Math.abs(layer.clusterZoom - newZoom) >= 1) {\n      if (zoom !== Math.floor(newZoom)) {\n        source.updateClusterData(Math.floor(newZoom));\n      }\n      layer.clusterZoom = newZoom;\n      return true;\n    }\n    return false;\n  }\n}\n"],"file":"DataSourcePlugin.js"}

package/es/plugins/LayerModelPlugin.d.ts

@@ -4,5 +4,7 @@ import 'reflect-metadata';
  * Layer Model 初始化，更新，销毁
  */
 export default class LayerModelPlugin implements ILayerPlugin {
+    initLayerModel(layer: ILayer): void;
+    prepareLayerModel(layer: ILayer): void;
     apply(layer: ILayer): void;
 }

package/es/plugins/LayerModelPlugin.js

@@ -11,18 +11,46 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = function () {
   }
 
   _createClass(LayerModelPlugin, [{
+    key: "initLayerModel",
+    value: function initLayerModel(layer) {
+      layer.prepareBuildModel();
+      layer.buildModels();
+      layer.emit('modelLoaded', null);
+      layer.styleNeedUpdate = false;
+    }
+  }, {
+    key: "prepareLayerModel",
+    value: function prepareLayerModel(layer) {
+      layer.prepareBuildModel();
+      layer.clearModels();
+      layer.buildModels();
+      layer.emit('modelLoaded', null);
+      layer.layerModelNeedUpdate = false;
+    }
+  }, {
     key: "apply",
     value: function apply(layer) {
+      var _this = this;
+
       layer.hooks.init.tap('LayerModelPlugin', function () {
-        layer.prepareBuildModel();
-        layer.buildModels();
-        layer.styleNeedUpdate = false;
+        layer.inited = true;
+        var source = layer.getSource();
+
+        if (source.inited) {
+          _this.initLayerModel(layer);
+        }
       });
       layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
-        layer.prepareBuildModel();
-        layer.clearModels();
-        layer.buildModels();
-        layer.layerModelNeedUpdate = false;
+        var source = layer.getSource();
+
+        if (source.inited) {
+          _this.prepareLayerModel(layer);
+        } else {
+          source.once('sourceUpdate', function () {
+            _this.prepareLayerModel(layer);
+          });
+        }
+
         return false;
       });
     }

package/es/plugins/LayerModelPlugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/LayerModelPlugin.ts"],"names":["injectable","LayerModelPlugin","layer","hooks","init","tap","prepareBuildModel","buildModels","styleNeedUpdate","beforeRenderData","clearModels","layerModelNeedUpdate"],"mappings":";;;;;AACA,SAASA,UAAT,QAA2B,WAA3B;AACA,OAAO,kBAAP;IAKqBC,gB,WADpBD,UAAU,E;;;;;;;WAET,eAAaE,KAAb,EAA4B;AAC1BA,MAAAA,KAAK,CAACC,KAAN,CAAYC,IAAZ,CAAiBC,GAAjB,CAAqB,kBAArB,EAAyC,YAAM;AAE7CH,QAAAA,KAAK,CAACI,iBAAN;AAEAJ,QAAAA,KAAK,CAACK,WAAN;AACAL,QAAAA,KAAK,CAACM,eAAN,GAAwB,KAAxB;AACD,OAND;AAQAN,MAAAA,KAAK,CAACC,KAAN,CAAYM,gBAAZ,CAA6BJ,GAA7B,CAAiC,kBAAjC,EAAqD,YAAM;AAEzDH,QAAAA,KAAK,CAACI,iBAAN;AAEAJ,QAAAA,KAAK,CAACQ,WAAN;AAEAR,QAAAA,KAAK,CAACK,WAAN;AACAL,QAAAA,KAAK,CAACS,oBAAN,GAA6B,KAA7B;AACA,eAAO,KAAP;AACD,OATD;AAUD;;;;;SApBkBV,gB","sourcesContent":["import { ILayer, ILayerPlugin, IMapService, TYPES } from '@antv/l7-core';\nimport { injectable } from 'inversify';\nimport 'reflect-metadata';\n/**\n * Layer Model 初始化，更新，销毁\n */\n@injectable()\nexport default class LayerModelPlugin implements ILayerPlugin {\n  public apply(layer: ILayer) {\n    layer.hooks.init.tap('LayerModelPlugin', () => {\n      // 更新Model 配置项\n      layer.prepareBuildModel();\n      // 初始化 Model\n      layer.buildModels();\n      layer.styleNeedUpdate = false;\n    });\n\n    layer.hooks.beforeRenderData.tap('DataSourcePlugin', () => {\n      // 更新Model 配置项\n      layer.prepareBuildModel();\n\n      layer.clearModels();\n      // 初始化 Model\n      layer.buildModels();\n      layer.layerModelNeedUpdate = false;\n      return false;\n    });\n  }\n}\n"],"file":"LayerModelPlugin.js"}
+{"version":3,"sources":["../../src/plugins/LayerModelPlugin.ts"],"names":["injectable","LayerModelPlugin","layer","prepareBuildModel","buildModels","emit","styleNeedUpdate","clearModels","layerModelNeedUpdate","hooks","init","tap","inited","source","getSource","initLayerModel","beforeRenderData","prepareLayerModel","once"],"mappings":";;;;;AACA,SAASA,UAAT,QAA2B,WAA3B;AACA,OAAO,kBAAP;IAKqBC,gB,WADpBD,UAAU,E;;;;;;;WAET,wBAAsBE,KAAtB,EAAqC;AAEnCA,MAAAA,KAAK,CAACC,iBAAN;AAEAD,MAAAA,KAAK,CAACE,WAAN;AAEAF,MAAAA,KAAK,CAACG,IAAN,CAAW,aAAX,EAA0B,IAA1B;AACAH,MAAAA,KAAK,CAACI,eAAN,GAAwB,KAAxB;AACD;;;WAED,2BAAyBJ,KAAzB,EAAwC;AAEtCA,MAAAA,KAAK,CAACC,iBAAN;AACAD,MAAAA,KAAK,CAACK,WAAN;AAEAL,MAAAA,KAAK,CAACE,WAAN;AAEAF,MAAAA,KAAK,CAACG,IAAN,CAAW,aAAX,EAA0B,IAA1B;AACAH,MAAAA,KAAK,CAACM,oBAAN,GAA6B,KAA7B;AACD;;;WAED,eAAaN,KAAb,EAA4B;AAAA;;AAC1BA,MAAAA,KAAK,CAACO,KAAN,CAAYC,IAAZ,CAAiBC,GAAjB,CAAqB,kBAArB,EAAyC,YAAM;AAC7CT,QAAAA,KAAK,CAACU,MAAN,GAAe,IAAf;AACA,YAAMC,MAAM,GAAGX,KAAK,CAACY,SAAN,EAAf;;AACA,YAAID,MAAM,CAACD,MAAX,EAAmB;AACjB,UAAA,KAAI,CAACG,cAAL,CAAoBb,KAApB;AACD;AACF,OAND;AAQAA,MAAAA,KAAK,CAACO,KAAN,CAAYO,gBAAZ,CAA6BL,GAA7B,CAAiC,kBAAjC,EAAqD,YAAM;AACzD,YAAME,MAAM,GAAGX,KAAK,CAACY,SAAN,EAAf;;AACA,YAAID,MAAM,CAACD,MAAX,EAAmB;AACjB,UAAA,KAAI,CAACK,iBAAL,CAAuBf,KAAvB;AACD,SAFD,MAEO;AACLW,UAAAA,MAAM,CAACK,IAAP,CAAY,cAAZ,EAA4B,YAAM;AAChC,YAAA,KAAI,CAACD,iBAAL,CAAuBf,KAAvB;AACD,WAFD;AAGD;;AACD,eAAO,KAAP;AACD,OAVD;AAWD;;;;;SA1CkBD,gB","sourcesContent":["import { ILayer, ILayerPlugin, IMapService, TYPES } from '@antv/l7-core';\nimport { injectable } from 'inversify';\nimport 'reflect-metadata';\n/**\n * Layer Model 初始化，更新，销毁\n */\n@injectable()\nexport default class LayerModelPlugin implements ILayerPlugin {\n  public initLayerModel(layer: ILayer) {\n    // 更新Model 配置项\n    layer.prepareBuildModel();\n    // 初始化 Model\n    layer.buildModels();\n    // emit layer model loaded\n    layer.emit('modelLoaded', null);\n    layer.styleNeedUpdate = false;\n  }\n\n  public prepareLayerModel(layer: ILayer) {\n    // 更新Model 配置项\n    layer.prepareBuildModel();\n    layer.clearModels();\n    // 初始化 Model\n    layer.buildModels();\n    // emit layer model loaded\n    layer.emit('modelLoaded', null);\n    layer.layerModelNeedUpdate = false;\n  }\n\n  public apply(layer: ILayer) {\n    layer.hooks.init.tap('LayerModelPlugin', () => {\n      layer.inited = true;\n      const source = layer.getSource();\n      if (source.inited) {\n        this.initLayerModel(layer);\n      }\n    });\n\n    layer.hooks.beforeRenderData.tap('DataSourcePlugin', () => {\n      const source = layer.getSource();\n      if (source.inited) {\n        this.prepareLayerModel(layer);\n      } else {\n        source.once('sourceUpdate', () => {\n          this.prepareLayerModel(layer);\n        });\n      }\n      return false;\n    });\n  }\n}\n"],"file":"LayerModelPlugin.js"}

package/es/plugins/PixelPickingPlugin.js

@@ -23,7 +23,10 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = function () {
       var rendererService = _ref.rendererService,
           styleAttributeService = _ref.styleAttributeService;
       layer.hooks.init.tap('PixelPickingPlugin', function () {
-        var enablePicking = true;
+        var _layer$getLayerConfig = layer.getLayerConfig(),
+            enablePicking = _layer$getLayerConfig.enablePicking,
+            enableMultiPassRenderer = _layer$getLayerConfig.enableMultiPassRenderer;
+
         styleAttributeService.registerStyleAttribute({
           name: 'pickingColor',
           type: AttributeType.Attribute,
@@ -42,8 +45,8 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = function () {
         });
       });
       layer.hooks.beforePickingEncode.tap('PixelPickingPlugin', function () {
-        var _layer$getLayerConfig = layer.getLayerConfig(),
-            enablePicking = _layer$getLayerConfig.enablePicking;
+        var _layer$getLayerConfig2 = layer.getLayerConfig(),
+            enablePicking = _layer$getLayerConfig2.enablePicking;
 
         if (enablePicking && layer.isVisible()) {
           layer.models.forEach(function (model) {
@@ -54,8 +57,8 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = function () {
         }
       });
       layer.hooks.afterPickingEncode.tap('PixelPickingPlugin', function () {
-        var _layer$getLayerConfig2 = layer.getLayerConfig(),
-            enablePicking = _layer$getLayerConfig2.enablePicking;
+        var _layer$getLayerConfig3 = layer.getLayerConfig(),
+            enablePicking = _layer$getLayerConfig3.enablePicking;
 
         if (enablePicking && layer.isVisible()) {
           layer.models.forEach(function (model) {
@@ -66,10 +69,10 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = function () {
         }
       });
       layer.hooks.beforeHighlight.tap('PixelPickingPlugin', function (pickedColor) {
-        var _layer$getLayerConfig3 = layer.getLayerConfig(),
-            highlightColor = _layer$getLayerConfig3.highlightColor,
-            _layer$getLayerConfig4 = _layer$getLayerConfig3.activeMix,
-            activeMix = _layer$getLayerConfig4 === void 0 ? 0 : _layer$getLayerConfig4;
+        var _layer$getLayerConfig4 = layer.getLayerConfig(),
+            highlightColor = _layer$getLayerConfig4.highlightColor,
+            _layer$getLayerConfig5 = _layer$getLayerConfig4.activeMix,
+            activeMix = _layer$getLayerConfig5 === void 0 ? 0 : _layer$getLayerConfig5;
 
         var highlightColorInArray = typeof highlightColor === 'string' ? rgb2arr(highlightColor) : highlightColor || [1, 0, 0, 1];
         layer.updateLayerConfig({
@@ -87,10 +90,10 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = function () {
         });
       });
       layer.hooks.beforeSelect.tap('PixelPickingPlugin', function (pickedColor) {
-        var _layer$getLayerConfig5 = layer.getLayerConfig(),
-            selectColor = _layer$getLayerConfig5.selectColor,
-            _layer$getLayerConfig6 = _layer$getLayerConfig5.selectMix,
-            selectMix = _layer$getLayerConfig6 === void 0 ? 0 : _layer$getLayerConfig6;
+        var _layer$getLayerConfig6 = layer.getLayerConfig(),
+            selectColor = _layer$getLayerConfig6.selectColor,
+            _layer$getLayerConfig7 = _layer$getLayerConfig6.selectMix,
+            selectMix = _layer$getLayerConfig7 === void 0 ? 0 : _layer$getLayerConfig7;
 
         var highlightColorInArray = typeof selectColor === 'string' ? rgb2arr(selectColor) : selectColor || [1, 0, 0, 1];
         layer.updateLayerConfig({

package/es/plugins/PixelPickingPlugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/PixelPickingPlugin.ts"],"names":["AttributeType","gl","decodePickingColor","encodePickingColor","rgb2arr","injectable","PickingStage","NONE","ENCODE","HIGHLIGHT","PixelPickingPlugin","layer","rendererService","styleAttributeService","hooks","init","tap","enablePicking","registerStyleAttribute","name","type","Attribute","descriptor","buffer","data","FLOAT","size","update","feature","featureIdx","id","beforePickingEncode","getLayerConfig","isVisible","models","forEach","model","addUniforms","u_PickingStage","afterPickingEncode","beforeHighlight","pickedColor","highlightColor","activeMix","highlightColorInArray","updateLayerConfig","pickedFeatureID","Uint8Array","u_PickingColor","u_HighlightColor","map","c","u_activeMix","beforeSelect","selectColor","selectMix","u_CurrentSelectedId","u_SelectColor","u_EnableSelect"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  ILayer,\n  ILayerPlugin,\n  IRendererService,\n  IStyleAttributeService,\n} from '@antv/l7-core';\nimport {\n  decodePickingColor,\n  encodePickingColor,\n  rgb2arr,\n} from '@antv/l7-utils';\nimport { injectable } from 'inversify';\nimport 'reflect-metadata';\n\nconst PickingStage = {\n  NONE: 0.0,\n  ENCODE: 1.0,\n  HIGHLIGHT: 2.0,\n};\n\n@injectable()\nexport default class PixelPickingPlugin implements ILayerPlugin {\n  public apply(\n    layer: ILayer,\n    {\n      rendererService,\n      styleAttributeService,\n    }: {\n      rendererService: IRendererService;\n      styleAttributeService: IStyleAttributeService;\n    },\n  ) {\n    // TODO: 由于 Shader 目前无法根据是否开启拾取进行内容修改，因此即使不开启也需要生成 a_PickingColor\n    layer.hooks.init.tap('PixelPickingPlugin', () => {\n      // const { enablePicking, enableMultiPassRenderer } = layer.getLayerConfig();\n      const enablePicking = true;\n      styleAttributeService.registerStyleAttribute({\n        name: 'pickingColor',\n        type: AttributeType.Attribute,\n        descriptor: {\n          name: 'a_PickingColor',\n          buffer: {\n            data: [],\n            type: gl.FLOAT,\n          },\n          size: 3,\n          // TODO: 固定 feature range 范围内的 pickingColor 都是固定的，可以生成 cache\n          update: (feature: IEncodeFeature, featureIdx: number) => {\n            // 只有开启拾取才需要 encode\n            const { id } = feature;\n            return enablePicking ? encodePickingColor(id as number) : [0, 0, 0];\n          },\n        },\n      });\n    });\n    // 必须要与 PixelPickingPass 结合使用，因此必须开启 multiPassRenderer\n    // if (layer.multiPassRenderer) {\n    layer.hooks.beforePickingEncode.tap('PixelPickingPlugin', () => {\n      const { enablePicking } = layer.getLayerConfig();\n      if (enablePicking && layer.isVisible()) {\n        layer.models.forEach((model) =>\n          model.addUniforms({\n            u_PickingStage: PickingStage.ENCODE,\n          }),\n        );\n      }\n    });\n\n    layer.hooks.afterPickingEncode.tap('PixelPickingPlugin', () => {\n      const { enablePicking } = layer.getLayerConfig();\n      // 区分选中高亮 和滑过高亮\n      if (enablePicking && layer.isVisible()) {\n        layer.models.forEach((model) =>\n          model.addUniforms({\n            u_PickingStage: PickingStage.HIGHLIGHT,\n          }),\n        );\n      }\n    });\n\n    layer.hooks.beforeHighlight.tap(\n      'PixelPickingPlugin',\n      (pickedColor: number[]) => {\n        const { highlightColor, activeMix = 0 } = layer.getLayerConfig();\n        // const {\n        //   highlightColor,\n        //   activeMix = 0,\n        //   enableSelect,\n        // } = layer.getLayerConfig();\n        const highlightColorInArray =\n          typeof highlightColor === 'string'\n            ? rgb2arr(highlightColor)\n            : highlightColor || [1, 0, 0, 1];\n\n        // const { selectColor } = layer.getLayerConfig();\n        // const selectColorInArray =\n        //   typeof selectColor === 'string'\n        //     ? rgb2arr(selectColor)\n        //     : selectColor || [1, 0, 0, 1];\n        layer.updateLayerConfig({\n          pickedFeatureID: decodePickingColor(new Uint8Array(pickedColor)),\n        });\n        // const currentSelectedId = layer.getCurrentSelectedId();\n        layer.models.forEach((model) =>\n          model.addUniforms({\n            u_PickingStage: PickingStage.HIGHLIGHT,\n            u_PickingColor: pickedColor,\n            u_HighlightColor: highlightColorInArray.map((c) => c * 255),\n            u_activeMix: activeMix,\n            // u_CurrentSelectedId: currentSelectedId\n            //   ? encodePickingColor(layer.getCurrentSelectedId()!)\n            //   : [0, 0, 0],\n            // u_SelectColor: selectColorInArray.map((c) => c * 255),\n            // u_EnableSelect: +(enableSelect || false),\n          }),\n        );\n      },\n    );\n\n    layer.hooks.beforeSelect.tap(\n      'PixelPickingPlugin',\n      (pickedColor: number[]) => {\n        const { selectColor, selectMix = 0 } = layer.getLayerConfig();\n        const highlightColorInArray =\n          typeof selectColor === 'string'\n            ? rgb2arr(selectColor)\n            : selectColor || [1, 0, 0, 1];\n        layer.updateLayerConfig({\n          pickedFeatureID: decodePickingColor(new Uint8Array(pickedColor)),\n        });\n        layer.models.forEach((model) =>\n          model.addUniforms({\n            u_PickingStage: PickingStage.HIGHLIGHT,\n            u_PickingColor: pickedColor,\n            u_HighlightColor: highlightColorInArray.map((c) => c * 255),\n            u_activeMix: selectMix,\n            u_CurrentSelectedId: pickedColor,\n            u_SelectColor: highlightColorInArray.map((c) => c * 255),\n            u_EnableSelect: 1,\n          }),\n        );\n      },\n    );\n    // }\n  }\n}\n"],"file":"PixelPickingPlugin.js"}
+{"version":3,"sources":["../../src/plugins/PixelPickingPlugin.ts"],"names":["AttributeType","gl","decodePickingColor","encodePickingColor","rgb2arr","injectable","PickingStage","NONE","ENCODE","HIGHLIGHT","PixelPickingPlugin","layer","rendererService","styleAttributeService","hooks","init","tap","getLayerConfig","enablePicking","enableMultiPassRenderer","registerStyleAttribute","name","type","Attribute","descriptor","buffer","data","FLOAT","size","update","feature","featureIdx","id","beforePickingEncode","isVisible","models","forEach","model","addUniforms","u_PickingStage","afterPickingEncode","beforeHighlight","pickedColor","highlightColor","activeMix","highlightColorInArray","updateLayerConfig","pickedFeatureID","Uint8Array","u_PickingColor","u_HighlightColor","map","c","u_activeMix","beforeSelect","selectColor","selectMix","u_CurrentSelectedId","u_SelectColor","u_EnableSelect"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  ILayer,\n  ILayerPlugin,\n  IRendererService,\n  IStyleAttributeService,\n} from '@antv/l7-core';\nimport {\n  decodePickingColor,\n  encodePickingColor,\n  rgb2arr,\n} from '@antv/l7-utils';\nimport { injectable } from 'inversify';\nimport 'reflect-metadata';\n\nconst PickingStage = {\n  NONE: 0.0,\n  ENCODE: 1.0,\n  HIGHLIGHT: 2.0,\n};\n\n@injectable()\nexport default class PixelPickingPlugin implements ILayerPlugin {\n  public apply(\n    layer: ILayer,\n    {\n      rendererService,\n      styleAttributeService,\n    }: {\n      rendererService: IRendererService;\n      styleAttributeService: IStyleAttributeService;\n    },\n  ) {\n    // TODO: 由于 Shader 目前无法根据是否开启拾取进行内容修改，因此即使不开启也需要生成 a_PickingColor\n    layer.hooks.init.tap('PixelPickingPlugin', () => {\n      const { enablePicking, enableMultiPassRenderer } = layer.getLayerConfig();\n      // const enablePicking = true;\n      styleAttributeService.registerStyleAttribute({\n        name: 'pickingColor',\n        type: AttributeType.Attribute,\n        descriptor: {\n          name: 'a_PickingColor',\n          buffer: {\n            data: [],\n            type: gl.FLOAT,\n          },\n          size: 3,\n          // TODO: 固定 feature range 范围内的 pickingColor 都是固定的，可以生成 cache\n          update: (feature: IEncodeFeature, featureIdx: number) => {\n            // 只有开启拾取才需要 encode\n            const { id } = feature;\n            return enablePicking ? encodePickingColor(id as number) : [0, 0, 0];\n          },\n        },\n      });\n    });\n    // 必须要与 PixelPickingPass 结合使用，因此必须开启 multiPassRenderer\n    // if (layer.multiPassRenderer) {\n    layer.hooks.beforePickingEncode.tap('PixelPickingPlugin', () => {\n      const { enablePicking } = layer.getLayerConfig();\n      if (enablePicking && layer.isVisible()) {\n        layer.models.forEach((model) =>\n          model.addUniforms({\n            u_PickingStage: PickingStage.ENCODE,\n          }),\n        );\n      }\n    });\n\n    layer.hooks.afterPickingEncode.tap('PixelPickingPlugin', () => {\n      const { enablePicking } = layer.getLayerConfig();\n      // 区分选中高亮 和滑过高亮\n      if (enablePicking && layer.isVisible()) {\n        layer.models.forEach((model) =>\n          model.addUniforms({\n            u_PickingStage: PickingStage.HIGHLIGHT,\n          }),\n        );\n      }\n    });\n\n    layer.hooks.beforeHighlight.tap(\n      'PixelPickingPlugin',\n      (pickedColor: number[]) => {\n        const { highlightColor, activeMix = 0 } = layer.getLayerConfig();\n        // const {\n        //   highlightColor,\n        //   activeMix = 0,\n        //   enableSelect,\n        // } = layer.getLayerConfig();\n        const highlightColorInArray =\n          typeof highlightColor === 'string'\n            ? rgb2arr(highlightColor)\n            : highlightColor || [1, 0, 0, 1];\n\n        // const { selectColor } = layer.getLayerConfig();\n        // const selectColorInArray =\n        //   typeof selectColor === 'string'\n        //     ? rgb2arr(selectColor)\n        //     : selectColor || [1, 0, 0, 1];\n        layer.updateLayerConfig({\n          pickedFeatureID: decodePickingColor(new Uint8Array(pickedColor)),\n        });\n        // const currentSelectedId = layer.getCurrentSelectedId();\n        layer.models.forEach((model) =>\n          model.addUniforms({\n            u_PickingStage: PickingStage.HIGHLIGHT,\n            u_PickingColor: pickedColor,\n            u_HighlightColor: highlightColorInArray.map((c) => c * 255),\n            u_activeMix: activeMix,\n            // u_CurrentSelectedId: currentSelectedId\n            //   ? encodePickingColor(layer.getCurrentSelectedId()!)\n            //   : [0, 0, 0],\n            // u_SelectColor: selectColorInArray.map((c) => c * 255),\n            // u_EnableSelect: +(enableSelect || false),\n          }),\n        );\n      },\n    );\n\n    layer.hooks.beforeSelect.tap(\n      'PixelPickingPlugin',\n      (pickedColor: number[]) => {\n        const { selectColor, selectMix = 0 } = layer.getLayerConfig();\n        const highlightColorInArray =\n          typeof selectColor === 'string'\n            ? rgb2arr(selectColor)\n            : selectColor || [1, 0, 0, 1];\n        layer.updateLayerConfig({\n          pickedFeatureID: decodePickingColor(new Uint8Array(pickedColor)),\n        });\n        layer.models.forEach((model) =>\n          model.addUniforms({\n            u_PickingStage: PickingStage.HIGHLIGHT,\n            u_PickingColor: pickedColor,\n            u_HighlightColor: highlightColorInArray.map((c) => c * 255),\n            u_activeMix: selectMix,\n            u_CurrentSelectedId: pickedColor,\n            u_SelectColor: highlightColorInArray.map((c) => c * 255),\n            u_EnableSelect: 1,\n          }),\n        );\n      },\n    );\n    // }\n  }\n}\n"],"file":"PixelPickingPlugin.js"}

package/es/point/index.d.ts

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

package/es/point/index.js

@@ -43,14 +43,26 @@ var PointLayer = function (_BaseLayer) {
   _createClass(PointLayer, [{
     key: "buildModels",
     value: function buildModels() {
+      var _this2 = this;
+
       var modelType = this.getModelType();
       this.layerModel = new PointModels[modelType](this);
-      this.models = this.layerModel.initModels();
+      this.layerModel.initModels(function (models) {
+        _this2.models = models;
+
+        _this2.layerService.updateLayerRenderList();
+
+        _this2.renderLayers();
+      });
     }
   }, {
     key: "rebuildModels",
     value: function rebuildModels() {
-      this.models = this.layerModel.buildModels();
+      var _this3 = this;
+
+      this.layerModel.buildModels(function (models) {
+        return _this3.models = models;
+      });
     }
   }, {
     key: "getModelTypeWillEmptyData",
@@ -121,7 +133,6 @@ var PointLayer = function (_BaseLayer) {
         },
         extrude: {},
         image: {},
-        icon: {},
         text: {
           blend: 'normal'
         },
@@ -135,16 +146,12 @@ var PointLayer = function (_BaseLayer) {
   }, {
     key: "getModelType",
     value: function getModelType() {
-      var PointTypes = ['fillImage', 'fill', 'radar', 'image', 'normal', 'simplePoint', 'extrude', 'text', 'icon', 'vectorpoint', 'tile', 'earthFill', 'earthExtrude'];
+      var PointTypes = ['fillImage', 'fill', 'radar', 'image', 'normal', 'simplePoint', 'extrude', 'text', 'vectorpoint', 'tile', 'earthFill', 'earthExtrude'];
 
       if (this.layerSource.parser.type === 'mvt') {
         return 'vectorpoint';
       }
 
-      if (this.layerType && PointTypes.includes(this.layerType)) {
-        return this.layerType;
-      }
-
       var layerData = this.getEncodedData();
 
       var _this$getLayerConfig2 = this.getLayerConfig(),
@@ -173,26 +180,30 @@ var PointLayer = function (_BaseLayer) {
           return 'radar';
         }
 
-        if (shape === 'fillImage') {
+        if (this.layerType === 'fillImage') {
           return 'fillImage';
         }
 
         if ((shape2d === null || shape2d === void 0 ? void 0 : shape2d.indexOf(shape)) !== -1) {
-          return 'fill';
+          if (this.mapService.version === 'GLOBEL') {
+            return 'earthFill';
+          } else {
+            return 'fill';
+          }
         }
 
         if ((shape3d === null || shape3d === void 0 ? void 0 : shape3d.indexOf(shape)) !== -1) {
-          return 'extrude';
+          if (this.mapService.version === 'GLOBEL') {
+            return 'earthExtrude';
+          } else {
+            return 'extrude';
+          }
         }
 
         if (iconMap.hasOwnProperty(shape)) {
           return 'image';
         }
 
-        if (this.fontService.getGlyph(shape) !== '') {
-          return 'icon';
-        }
-
         return 'text';
       }
     }

package/es/point/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/point/index.ts"],"names":["BaseLayer","PointModels","PointLayer","modelType","getModelType","layerModel","models","initModels","buildModels","shapeOption","field","values","getLayerConfig","shape2d","shape3d","iconMap","iconService","getIconMap","indexOf","Array","v","hasOwnProperty","properties","opacity","type","minimum","maximum","defaultConfig","fillImage","normal","blend","radar","simplePoint","fill","extrude","image","icon","text","vectorpoint","tile","earthFill","earthExtrude","PointTypes","layerSource","parser","layerType","includes","layerData","getEncodedData","item","find","fe","getModelTypeWillEmptyData","shape","fontService","getGlyph"],"mappings":"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","sourcesContent":["import { IEncodeFeature } from '@antv/l7-core';\nimport BaseLayer from '../core/BaseLayer';\nimport { IPointLayerStyleOptions } from '../core/interface';\nimport PointModels, { PointType } from './models/index';\n\nexport default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {\n  public type: string = 'PointLayer';\n  public buildModels() {\n    const modelType = this.getModelType();\n    this.layerModel = new PointModels[modelType](this);\n    this.models = this.layerModel.initModels();\n  }\n  public rebuildModels() {\n    this.models = this.layerModel.buildModels();\n  }\n\n  /**\n   * 在未传入数据的时候判断点图层的 shape 类型\n   * @returns\n   */\n  public getModelTypeWillEmptyData(): PointType {\n    if (this.shapeOption) {\n      const { field, values } = this.shapeOption;\n      const { shape2d, shape3d } = this.getLayerConfig();\n\n      const iconMap = this.iconService.getIconMap();\n\n      if (field && shape2d?.indexOf(field as string) !== -1) {\n        return 'fill';\n      }\n\n      if (values && values instanceof Array) {\n        for (const v of values) {\n          if (typeof v === 'string' && iconMap.hasOwnProperty(v as string)) {\n            return 'image';\n          }\n        }\n      }\n    }\n    return 'normal';\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      fillImage: {},\n      normal: {\n        blend: 'additive',\n      },\n      radar: {},\n      simplePoint: {},\n      fill: { blend: 'normal' },\n      extrude: {},\n      image: {},\n      icon: {},\n      text: {\n        blend: 'normal',\n      },\n      vectorpoint: {},\n      tile: {},\n      earthFill: {},\n      earthExtrude: {},\n    };\n    return defaultConfig[type];\n  }\n\n  protected getModelType(): PointType {\n    const PointTypes = [\n      'fillImage',\n      'fill',\n      'radar',\n      'image',\n      'normal',\n      'simplePoint',\n      'extrude',\n      'text',\n      'icon',\n      'vectorpoint',\n      'tile',\n      'earthFill',\n      'earthExtrude',\n    ];\n    if (this.layerSource.parser.type === 'mvt') {\n      return 'vectorpoint';\n    }\n    if (this.layerType && PointTypes.includes(this.layerType)) {\n      return this.layerType as PointType;\n    }\n    // pointlayer\n    //  2D、 3d、 shape、image、text、normal、\n    const layerData = this.getEncodedData();\n    const { shape2d, shape3d } = this.getLayerConfig();\n    const iconMap = this.iconService.getIconMap();\n    const item = layerData.find((fe: IEncodeFeature) => {\n      return fe.hasOwnProperty('shape');\n    });\n    if (!item) {\n      // return 'normal';\n      return this.getModelTypeWillEmptyData();\n    } else {\n      const shape = item.shape;\n      if (shape === 'dot') {\n        return 'normal';\n      }\n      if (shape === 'simple') {\n        return 'simplePoint';\n      }\n      if (shape === 'radar') {\n        return 'radar';\n      }\n      if (shape === 'fillImage') {\n        return 'fillImage';\n      }\n      if (shape2d?.indexOf(shape as string) !== -1) {\n        return 'fill';\n      }\n      if (shape3d?.indexOf(shape as string) !== -1) {\n        return 'extrude';\n      }\n      if (iconMap.hasOwnProperty(shape as string)) {\n        return 'image';\n      }\n      if (this.fontService.getGlyph(shape as string) !== '') {\n        return 'icon';\n      }\n      return 'text';\n    }\n  }\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/point/index.ts"],"names":["BaseLayer","PointModels","PointLayer","modelType","getModelType","layerModel","initModels","models","layerService","updateLayerRenderList","renderLayers","buildModels","shapeOption","field","values","getLayerConfig","shape2d","shape3d","iconMap","iconService","getIconMap","indexOf","Array","v","hasOwnProperty","properties","opacity","type","minimum","maximum","defaultConfig","fillImage","normal","blend","radar","simplePoint","fill","extrude","image","text","vectorpoint","tile","earthFill","earthExtrude","PointTypes","layerSource","parser","layerData","getEncodedData","item","find","fe","getModelTypeWillEmptyData","shape","layerType","mapService","version"],"mappings":"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","sourcesContent":["import { IEncodeFeature } from '@antv/l7-core';\nimport BaseLayer from '../core/BaseLayer';\nimport { IPointLayerStyleOptions } from '../core/interface';\nimport PointModels, { PointType } from './models/index';\n\nexport default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {\n  public type: string = 'PointLayer';\n  public buildModels() {\n    const modelType = this.getModelType();\n    this.layerModel = new PointModels[modelType](this);\n    this.layerModel.initModels((models) => {\n      this.models = models;\n      this.layerService.updateLayerRenderList();\n      this.renderLayers();\n    });\n  }\n  public rebuildModels() {\n    this.layerModel.buildModels((models) => (this.models = models));\n  }\n\n  /**\n   * 在未传入数据的时候判断点图层的 shape 类型\n   * @returns\n   */\n  public getModelTypeWillEmptyData(): PointType {\n    if (this.shapeOption) {\n      const { field, values } = this.shapeOption;\n      const { shape2d, shape3d } = this.getLayerConfig();\n\n      const iconMap = this.iconService.getIconMap();\n\n      if (field && shape2d?.indexOf(field as string) !== -1) {\n        return 'fill';\n      }\n\n      if (values && values instanceof Array) {\n        for (const v of values) {\n          if (typeof v === 'string' && iconMap.hasOwnProperty(v as string)) {\n            return 'image';\n          }\n        }\n      }\n    }\n    return 'normal';\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      fillImage: {},\n      normal: {\n        blend: 'additive',\n      },\n      radar: {},\n      simplePoint: {},\n      fill: { blend: 'normal' },\n      extrude: {},\n      image: {},\n      text: {\n        blend: 'normal',\n      },\n      vectorpoint: {},\n      tile: {},\n      earthFill: {},\n      earthExtrude: {},\n    };\n    return defaultConfig[type];\n  }\n\n  protected getModelType(): PointType {\n    const PointTypes = [\n      'fillImage',\n      'fill',\n      'radar',\n      'image',\n      'normal',\n      'simplePoint',\n      'extrude',\n      'text',\n      'vectorpoint',\n      'tile',\n      'earthFill',\n      'earthExtrude',\n    ];\n    if (this.layerSource.parser.type === 'mvt') {\n      return 'vectorpoint';\n    }\n\n    // pointlayer\n    //  2D、 3d、 shape、image、text、normal、\n    const layerData = this.getEncodedData();\n    const { shape2d, shape3d } = this.getLayerConfig();\n    const iconMap = this.iconService.getIconMap();\n    const item = layerData.find((fe: IEncodeFeature) => {\n      return fe.hasOwnProperty('shape');\n    });\n\n    if (!item) {\n      return this.getModelTypeWillEmptyData();\n    } else {\n      const shape = item.shape;\n      if (shape === 'dot') {\n        return 'normal';\n      }\n      if (shape === 'simple') {\n        return 'simplePoint';\n      }\n      if (shape === 'radar') {\n        return 'radar';\n      }\n      if (this.layerType === 'fillImage') {\n        return 'fillImage';\n      }\n      if (shape2d?.indexOf(shape as string) !== -1) {\n        if (this.mapService.version === 'GLOBEL') {\n          return 'earthFill';\n        } else {\n          return 'fill';\n        }\n      }\n      if (shape3d?.indexOf(shape as string) !== -1) {\n        if (this.mapService.version === 'GLOBEL') {\n          return 'earthExtrude';\n        } else {\n          return 'extrude';\n        }\n      }\n      if (iconMap.hasOwnProperty(shape as string)) {\n        return 'image';\n      }\n      return 'text';\n    }\n  }\n}\n"],"file":"index.js"}

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

@@ -17,8 +17,8 @@ export default class ExtrudeModel extends BaseModel {
         u_opacitylinear_dir: number;
         u_lightEnable: number;
     };
-    initModels(): IModel[];
-    buildModels(): IModel[];
+    initModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     protected registerBuiltinAttributes(): void;
 }

package/es/point/models/earthExtrude.js

@@ -12,11 +12,10 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 import { AttributeType, gl } from '@antv/l7-core';
-import { getCullFace, rgb2arr } from '@antv/l7-utils';
+import { calculateCentroid, getCullFace, rgb2arr } from '@antv/l7-utils';
 import BaseModel from '../../core/BaseModel';
 import { PointExtrudeTriangulation } from '../../core/triangulation';
 import { lglt2xyz } from '../../earth/utils';
-import { calculateCentroid } from '../../utils/geo';
 var pointExtrudeFrag = "varying vec4 v_color;\nuniform float u_opacity: 1.0;\n\nuniform float u_pickLight: 0.0;\n\n#pragma include \"picking\"\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\nuniform float u_linearColor: 0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\n\nuniform float u_opacitylinear: 0.0;\nuniform float u_opacitylinear_dir: 1.0;\n\nvoid main() {\n  float opacity = styleMappingMat[0][0];\n  float lightWeight = styleMappingMat[1][3];\n  float barLinearZ = styleMappingMat[2][3];\n\n  // \u8BBE\u7F6E\u5706\u67F1\u7684\u5E95\u8272\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    gl_FragColor = mix(u_sourceColor, u_targetColor, barLinearZ);\n    gl_FragColor.rgb *= lightWeight;\n  } else { // \u4F7F\u7528 color \u65B9\u6CD5\u4F20\u5165\u7684\u989C\u8272\n     gl_FragColor = v_color;\n  }\n\n  // \u5E94\u7528\u900F\u660E\u5EA6\n  gl_FragColor.a *= opacity;\n\n  // \u5F00\u542F\u900F\u660E\u5EA6\u6E10\u53D8\n  if(u_opacitylinear > 0.0) {\n    gl_FragColor.a *= u_opacitylinear_dir > 0.0 ? (1.0 - barLinearZ): barLinearZ;\n  }\n\n  // picking\n  if(u_pickLight > 0.0) {\n    gl_FragColor = filterColorAlpha(gl_FragColor, lightWeight);\n  } else {\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
 var pointExtrudeVert = "precision highp float;\n\n#define pi 3.1415926535\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec3 a_Position;\nattribute vec3 a_Pos;\nattribute vec4 a_Color;\nattribute vec3 a_Size;\nattribute vec3 a_Normal;\n\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_globel;\nuniform float u_r;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nvarying vec4 v_color;\n\nuniform float u_opacity : 1;\nuniform float u_lightEnable: 1;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nfloat getYRadian(float x, float z) {\n  if(x > 0.0 && z > 0.0) {\n    return atan(x/z);\n  } else if(x > 0.0 && z <= 0.0){\n    return atan(-z/x) + pi/2.0;\n  } else if(x <= 0.0 && z <= 0.0) {\n    return  pi + atan(x/z); //atan(x/z) + \n  } else {\n    return atan(z/-x) + pi*3.0/2.0;\n  }\n}\n\nfloat getXRadian(float y, float r) {\n  return atan(y/r);\n}\n\nvoid main() {\n\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA - lightWeight\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1] - linearZ(\u5782\u76F4\u65B9\u5411 0 - 1 \u7684\u503C)\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  vec3 size = a_Size * a_Position;\n\n  // a_Position.z \u662F\u5728\u6784\u5EFA\u7F51\u683C\u7684\u65F6\u5019\u4F20\u5165\u7684\u6807\u51C6\u503C 0 - 1\uFF0C\u5728\u63D2\u503C\u5668\u63D2\u503C\u53EF\u4EE5\u83B7\u53D6 0\uFF5E1 \u7EBF\u6027\u6E10\u53D8\u7684\u503C\n  styleMappingMat[2][3] =  a_Position.z;\n\n  vec3 offset = size; // \u63A7\u5236\u5706\u67F1\u4F53\u7684\u5927\u5C0F - \u4ECE\u6807\u51C6\u5355\u4F4D\u5706\u67F1\u4F53\u8FDB\u884C\u504F\u79FB\n  if(u_heightfixed < 1.0) { // \u5706\u67F1\u4F53\u4E0D\u56FA\u5B9A\u9AD8\u5EA6\n    \n    if (u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // P20 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF1\n      offset = offset * pow(2.0, (19.0 - u_Zoom));\n    }\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n      // P20_2 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF3\n      offset = offset * pow(2.0, (19.0 - 3.0 - u_Zoom));\n    }\n  } else {// \u5706\u67F1\u4F53\u56FA\u5B9A\u9AD8\u5EA6 \uFF08 \u5904\u7406 mapbox \uFF09\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      offset *= 4.0/pow(2.0, 21.0 - u_Zoom);\n    }\n  }\n\n\n  vec4 project_pos = project_position(vec4(a_Pos.xy, 0., 1.0));\n\n  // u_r \u63A7\u5236\u5706\u67F1\u7684\u751F\u957F\n  vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);\n\n  // \u5706\u67F1\u5149\u7167\u6548\u679C\n  float lightWeight = 1.0;\n  if(u_lightEnable > 0.0) { // \u53D6\u6D88\u4E09\u5143\u8868\u8FBE\u5F0F\uFF0C\u589E\u5F3A\u5065\u58EE\u6027\n    lightWeight = calc_lighting(pos);\n  }\n  styleMappingMat[1][3] = lightWeight;\n\n  v_color =vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  \n  // \u5728\u5730\u7403\u6A21\u5F0F\u4E0B\uFF0C\u5C06\u539F\u672C\u5782\u76F4\u4E8E xy \u5E73\u9762\u7684\u5706\u67F1\u8C03\u6574\u59FF\u6001\u5230\u9002\u5E94\u5706\u7684\u89D2\u5EA6\n  //\u65CB\u8F6C\u77E9\u9635mx\uFF0C\u521B\u5EFA\u7ED5x\u8F74\u65CB\u8F6C\u77E9\u9635\n  float r = sqrt(a_Pos.z*a_Pos.z + a_Pos.x*a_Pos.x);\n  float xRadian = getXRadian(a_Pos.y, r);\n  float xcos = cos(xRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u4F59\u5F26\u503C\n  float xsin = sin(xRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u6B63\u5F26\u503C\n  mat4 mx = mat4(\n    1,0,0,0,  \n    0,xcos,-xsin,0,  \n    0,xsin,xcos,0,  \n    0,0,0,1);\n\n  //\u65CB\u8F6C\u77E9\u9635my\uFF0C\u521B\u5EFA\u7ED5y\u8F74\u65CB\u8F6C\u77E9\u9635\n  float yRadian = getYRadian(a_Pos.x, a_Pos.z);\n  float ycos = cos(yRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u4F59\u5F26\u503C\n  float ysin = sin(yRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u6B63\u5F26\u503C\n  mat4 my = mat4(\n    ycos,0,-ysin,0,  \n    0,1,0,0,  \n    ysin,0,ycos,0,  \n    0,0,0,1);\n\n  gl_Position = u_ViewProjectionMatrix * vec4(( my * mx *  vec4(a_Position * a_Size, 1.0)).xyz + a_Pos, 1.0);\n  \n\n  setPickingColor(a_PickingColor);\n}\n";
 
@@ -146,33 +145,36 @@ var ExtrudeModel = function (_BaseModel) {
     }
   }, {
     key: "initModels",
-    value: function initModels() {
-      return this.buildModels();
+    value: function initModels(callbackModel) {
+      this.buildModels(callbackModel);
     }
   }, {
     key: "buildModels",
-    value: function buildModels() {
+    value: function buildModels(callbackModel) {
       var _ref2 = this.layer.getLayerConfig(),
-          _ref2$depth = _ref2.depth,
-          depth = _ref2$depth === void 0 ? true : _ref2$depth,
           _ref2$animateOption$r = _ref2.animateOption.repeat,
           repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
 
       this.raiserepeat = repeat;
-      return [this.layer.buildLayerModel({
-        moduleName: 'pointExtrude2',
+      this.layer.buildLayerModel({
+        moduleName: 'pointEarthExtrude',
         vertexShader: pointExtrudeVert,
         fragmentShader: pointExtrudeFrag,
         triangulation: PointExtrudeTriangulation,
-        blend: this.getBlend(),
+        depth: {
+          enable: true
+        },
         cull: {
           enable: true,
           face: getCullFace(this.mapService.version)
         },
-        depth: {
-          enable: depth
-        }
-      })];
+        blend: this.getBlend()
+      }).then(function (model) {
+        callbackModel([model]);
+      }).catch(function (err) {
+        console.warn(err);
+        callbackModel([]);
+      });
     }
   }, {
     key: "clearModels",

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/point/models/earthExtrude.ts"],"names":["AttributeType","gl","getCullFace","rgb2arr","BaseModel","PointExtrudeTriangulation","lglt2xyz","calculateCentroid","ExtrudeModel","layer","getLayerConfig","animateOption","enable","speed","repeat","opacity","sourceColor","targetColor","pickLight","heightfixed","opacityLinear","dir","lightEnable","dataTextureTest","dataTextureNeedUpdate","judgeStyleAttributes","encodeData","getEncodedData","calDataFrame","cellLength","cellProperties","data","width","height","rowCount","dataTexture","length","createTexture2D","flipY","format","LUMINANCE","type","FLOAT","useLinearColor","sourceColorArr","targetColorArr","raiseCount","raiserepeat","u_pickLight","Number","u_heightfixed","u_r","u_dataTexture","u_cellTypeLayout","getCellTypeLayout","u_opacity","u_linearColor","u_sourceColor","u_targetColor","u_opacitylinear","u_opacitylinear_dir","u_lightEnable","buildModels","depth","buildLayerModel","moduleName","vertexShader","pointExtrudeVert","fragmentShader","pointExtrudeFrag","triangulation","blend","getBlend","cull","face","mapService","version","destroy","styleAttributeService","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","size","update","feature","featureIdx","vertex","attributeIdx","buffersize","Array","isArray","STATIC_DRAW","normal","coordinates"],"mappings":";;;;;;;;;;;;;AAAA,SACEA,aADF,EAEEC,EAFF,QAMO,eANP;AAOA,SAASC,WAAT,EAAsBC,OAAtB,QAAqC,gBAArC;AAEA,OAAOC,SAAP,MAAsB,sBAAtB;AAEA,SAASC,yBAAT,QAA0C,0BAA1C;AACA,SAASC,QAAT,QAAyB,mBAAzB;AACA,SAASC,iBAAT,QAAkC,iBAAlC;;;;IAIqBC,Y;;;;;;;;;;;;;;;;iEACU,C;;kEACC,C;;;;;;;WAC9B,wBAAsB;AACpB,iBAoBI,KAAKC,KAAL,CAAWC,cAAX,EApBJ;AAAA,oCACEC,aADF;AAAA,UACEA,aADF,mCACkB;AACdC,QAAAA,MAAM,EAAE,KADM;AAEdC,QAAAA,KAAK,EAAE,IAFO;AAGdC,QAAAA,MAAM,EAAE;AAHM,OADlB;AAAA,8BAMEC,OANF;AAAA,UAMEA,OANF,6BAMY,CANZ;AAAA,UAQEC,WARF,QAQEA,WARF;AAAA,UASEC,WATF,QASEA,WATF;AAAA,gCAWEC,SAXF;AAAA,UAWEA,SAXF,+BAWc,KAXd;AAAA,kCAYEC,WAZF;AAAA,UAYEA,WAZF,iCAYgB,KAZhB;AAAA,oCAcEC,aAdF;AAAA,UAcEA,aAdF,mCAckB;AACdR,QAAAA,MAAM,EAAE,KADM;AAEdS,QAAAA,GAAG,EAAE;AAFS,OAdlB;AAAA,kCAmBEC,WAnBF;AAAA,UAmBEA,WAnBF,iCAmBgB,IAnBhB;;AAuBA,UACE,KAAKC,eAAL,IACA,KAAKC,qBAAL,CAA2B;AACzBT,QAAAA,OAAO,EAAPA;AADyB,OAA3B,CAFF,EAKE;AACA,aAAKU,oBAAL,CAA0B;AACxBV,UAAAA,OAAO,EAAPA;AADwB,SAA1B;AAGA,YAAMW,UAAU,GAAG,KAAKjB,KAAL,CAAWkB,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,EAAEtC,EAAE,CAACuC,SAHQ;AAInBC,UAAAA,IAAI,EAAExC,EAAE,CAACyC,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,EAAEtC,EAAE,CAACuC,SAHQ;AAInBC,UAAAA,IAAI,EAAExC,EAAE,CAACyC,KAJU;AAKnBV,UAAAA,KAAK,EAAE,CALY;AAMnBC,UAAAA,MAAM,EAAE;AANW,SAArB,CAVN;AAkBD;;AAGD,UAAIU,cAAc,GAAG,CAArB;AACA,UAAIC,cAAc,GAAG,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV,CAArB;AACA,UAAIC,cAAc,GAAG,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,EAAU,CAAV,CAArB;;AACA,UAAI7B,WAAW,IAAIC,WAAnB,EAAgC;AAC9B2B,QAAAA,cAAc,GAAGzC,OAAO,CAACa,WAAD,CAAxB;AACA6B,QAAAA,cAAc,GAAG1C,OAAO,CAACc,WAAD,CAAxB;AACA0B,QAAAA,cAAc,GAAG,CAAjB;AACD;;AAED,UAAI,KAAKG,UAAL,GAAkB,CAAlB,IAAuB,KAAKC,WAAL,GAAmB,CAA9C,EAAiD;AAC/C,YAAIpC,aAAa,CAACC,MAAlB,EAA0B;AACxB,qCAAyCD,aAAzC,CAAQE,KAAR;AAAA,cAAQA,KAAR,qCAAgB,IAAhB;AAAA,sCAAyCF,aAAzC,CAAsBG,MAAtB;AAAA,cAAsBA,MAAtB,sCAA+B,KAA/B;AACA,eAAKgC,UAAL,IAAmBjC,KAAnB;;AACA,cAAI,KAAKiC,UAAL,IAAmB,CAAvB,EAA0B;AACxB,gBAAI,KAAKC,WAAL,GAAmB,CAAvB,EAA0B;AACxB,mBAAKD,UAAL,GAAkB,CAAlB;AACA,mBAAKC,WAAL;AACD,aAHD,MAGO;AACL,mBAAKD,UAAL,GAAkB,CAAlB;AACD;AACF;AACF;AACF;;AAED,aAAO;AAELE,QAAAA,WAAW,EAAEC,MAAM,CAAC/B,SAAD,CAFd;AAILgC,QAAAA,aAAa,EAAED,MAAM,CAAC9B,WAAD,CAJhB;AAMLgC,QAAAA,GAAG,EAAExC,aAAa,CAACC,MAAd,IAAwB,KAAKmC,WAAL,GAAmB,CAA3C,GAA+C,KAAKD,UAApD,GAAiE,GANjE;AAQLM,QAAAA,aAAa,EAAE,KAAKjB,WARf;AASLkB,QAAAA,gBAAgB,EAAE,KAAKC,iBAAL,EATb;AAWLC,QAAAA,SAAS,EAAE,UAASxC,OAAT,IAAoBA,OAApB,GAA8B,GAXpC;AAcLyC,QAAAA,aAAa,EAAEb,cAdV;AAeLc,QAAAA,aAAa,EAAEb,cAfV;AAgBLc,QAAAA,aAAa,EAAEb,cAhBV;AAmBLc,QAAAA,eAAe,EAAEV,MAAM,CAAC7B,aAAa,CAACR,MAAf,CAnBlB;AAoBLgD,QAAAA,mBAAmB,EAAExC,aAAa,CAACC,GAAd,KAAsB,IAAtB,GAA6B,GAA7B,GAAmC,GApBnD;AAuBLwC,QAAAA,aAAa,EAAEZ,MAAM,CAAC3B,WAAD;AAvBhB,OAAP;AAyBD;;;WACD,sBAA8B;AAC5B,aAAO,KAAKwC,WAAL,EAAP;AACD;;;WAED,uBAA+B;AAE7B,kBAGI,KAAKrD,KAAL,CAAWC,cAAX,EAHJ;AAAA,8BACEqD,KADF;AAAA,UACEA,KADF,4BACU,IADV;AAAA,wCAEEpD,aAFF,CAEmBG,MAFnB;AAAA,UAEmBA,MAFnB,sCAE4B,CAF5B;;AAIA,WAAKiC,WAAL,GAAmBjC,MAAnB;AACA,aAAO,CACL,KAAKL,KAAL,CAAWuD,eAAX,CAA2B;AACzBC,QAAAA,UAAU,EAAE,eADa;AAEzBC,QAAAA,YAAY,EAAEC,gBAFW;AAGzBC,QAAAA,cAAc,EAAEC,gBAHS;AAIzBC,QAAAA,aAAa,EAAEjE,yBAJU;AAKzBkE,QAAAA,KAAK,EAAE,KAAKC,QAAL,EALkB;AAMzBC,QAAAA,IAAI,EAAE;AACJ7D,UAAAA,MAAM,EAAE,IADJ;AAEJ8D,UAAAA,IAAI,EAAExE,WAAW,CAAC,KAAKyE,UAAL,CAAgBC,OAAjB;AAFb,SANmB;AAUzBb,QAAAA,KAAK,EAAE;AACLnD,UAAAA,MAAM,EAAEmD;AADH;AAVkB,OAA3B,CADK,CAAP;AAgBD;;;WACD,uBAAqB;AAAA;;AACnB,gCAAK5B,WAAL,wEAAkB0C,OAAlB;AACD;;;WACD,qCAAsC;AAEpC,WAAKC,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,QAAAA,IAAI,EAAE,MAD0C;AAEhDvC,QAAAA,IAAI,EAAEzC,aAAa,CAACiF,SAF4B;AAGhDC,QAAAA,UAAU,EAAE;AACVF,UAAAA,IAAI,EAAE,QADI;AAEVG,UAAAA,MAAM,EAAE;AAENC,YAAAA,KAAK,EAAEnF,EAAE,CAACoF,YAFJ;AAGNtD,YAAAA,IAAI,EAAE,EAHA;AAINU,YAAAA,IAAI,EAAExC,EAAE,CAACyC;AAJH,WAFE;AAQV4C,UAAAA,IAAI,EAAE,CARI;AASVC,UAAAA,MAAM,EAAE,gBACNC,OADM,EAENC,UAFM,EAGNC,MAHM,EAINC,YAJM,EAKH;AACH,gBAAQL,IAAR,GAAiBE,OAAjB,CAAQF,IAAR;;AACA,gBAAIA,IAAJ,EAAU;AACR,kBAAIM,UAAoB,GAAG,EAA3B;;AACA,kBAAIC,KAAK,CAACC,OAAN,CAAcR,IAAd,CAAJ,EAAyB;AACvBM,gBAAAA,UAAU,GACRN,IAAI,CAAClD,MAAL,KAAgB,CAAhB,GAAoB,CAACkD,IAAI,CAAC,CAAD,CAAL,EAAUA,IAAI,CAAC,CAAD,CAAd,EAAmBA,IAAI,CAAC,CAAD,CAAvB,CAApB,GAAkDA,IADpD;AAED;;AACD,kBAAI,CAACO,KAAK,CAACC,OAAN,CAAcR,IAAd,CAAL,EAA0B;AACxBM,gBAAAA,UAAU,GAAG,CAACN,IAAD,EAAOA,IAAP,EAAaA,IAAb,CAAb;AACD;;AACD,qBAAOM,UAAP;AACD,aAVD,MAUO;AACL,qBAAO,CAAC,CAAD,EAAI,CAAJ,EAAO,CAAP,CAAP;AACD;AACF;AA7BS;AAHoC,OAAlD;AAqCA,WAAKd,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,QAAAA,IAAI,EAAE,QAD0C;AAEhDvC,QAAAA,IAAI,EAAEzC,aAAa,CAACiF,SAF4B;AAGhDC,QAAAA,UAAU,EAAE;AACVF,UAAAA,IAAI,EAAE,UADI;AAEVG,UAAAA,MAAM,EAAE;AAENC,YAAAA,KAAK,EAAEnF,EAAE,CAAC8F,WAFJ;AAGNhE,YAAAA,IAAI,EAAE,EAHA;AAINU,YAAAA,IAAI,EAAExC,EAAE,CAACyC;AAJH,WAFE;AAQV4C,UAAAA,IAAI,EAAE,CARI;AASVC,UAAAA,MAAM,EAAE,gBACNC,OADM,EAENC,UAFM,EAGNC,MAHM,EAINC,YAJM,EAKNK,MALM,EAMH;AACH,mBAAOA,MAAP;AACD;AAjBS;AAHoC,OAAlD;AAuBA,WAAKlB,qBAAL,CAA2BC,sBAA3B,CAAkD;AAChDC,QAAAA,IAAI,EAAE,KAD0C;AAEhDvC,QAAAA,IAAI,EAAEzC,aAAa,CAACiF,SAF4B;AAGhDC,QAAAA,UAAU,EAAE;AACVF,UAAAA,IAAI,EAAE,OADI;AAEVG,UAAAA,MAAM,EAAE;AAENC,YAAAA,KAAK,EAAEnF,EAAE,CAACoF,YAFJ;AAGNtD,YAAAA,IAAI,EAAE,EAHA;AAINU,YAAAA,IAAI,EAAExC,EAAE,CAACyC;AAJH,WAFE;AAQV4C,UAAAA,IAAI,EAAE,CARI;AASVC,UAAAA,MAAM,EAAE,gBAACC,OAAD,EAA0BC,UAA1B,EAAiD;AACvD,gBAAMQ,WAAW,GAAG1F,iBAAiB,CAACiF,OAAO,CAACS,WAAT,CAArC;AACA,mBAAO3F,QAAQ,CAAC,CAAC2F,WAAW,CAAC,CAAD,CAAZ,EAAiBA,WAAW,CAAC,CAAD,CAA5B,CAAD,CAAf;AAKD;AAhBS;AAHoC,OAAlD;AAsBD;;;;EAtOuC7F,S;;SAArBI,Y","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  ILayerConfig,\n  IModel,\n} from '@antv/l7-core';\nimport { getCullFace, rgb2arr } from '@antv/l7-utils';\nimport { isNumber } from 'lodash';\nimport BaseModel from '../../core/BaseModel';\nimport { IPointLayerStyleOptions } from '../../core/interface';\nimport { PointExtrudeTriangulation } from '../../core/triangulation';\nimport { lglt2xyz } from '../../earth/utils';\nimport { calculateCentroid } from '../../utils/geo';\nimport pointExtrudeFrag from '../shaders/earth/extrude_frag.glsl';\nimport pointExtrudeVert from '../shaders/earth/extrude_vert.glsl';\n\nexport default class ExtrudeModel extends BaseModel {\n  private raiseCount: number = 0;\n  private raiserepeat: number = 0;\n  public getUninforms() {\n    const {\n      animateOption = {\n        enable: false,\n        speed: 0.01,\n        repeat: false,\n      },\n      opacity = 1,\n\n      sourceColor,\n      targetColor,\n\n      pickLight = false,\n      heightfixed = false,\n\n      opacityLinear = {\n        enable: false,\n        dir: 'up',\n      },\n\n      lightEnable = true,\n    } = this.layer.getLayerConfig() as Partial<\n      ILayerConfig & IPointLayerStyleOptions\n    >;\n    if (\n      this.dataTextureTest &&\n      this.dataTextureNeedUpdate({\n        opacity,\n      })\n    ) {\n      this.judgeStyleAttributes({\n        opacity,\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\n    // 转化渐变色\n    let useLinearColor = 0; // 默认不生效\n    let sourceColorArr = [0, 0, 0, 0];\n    let targetColorArr = [0, 0, 0, 0];\n    if (sourceColor && targetColor) {\n      sourceColorArr = rgb2arr(sourceColor);\n      targetColorArr = rgb2arr(targetColor);\n      useLinearColor = 1;\n    }\n\n    if (this.raiseCount < 1 && this.raiserepeat > 0) {\n      if (animateOption.enable) {\n        const { speed = 0.01, repeat = false } = animateOption;\n        this.raiseCount += speed;\n        if (this.raiseCount >= 1) {\n          if (this.raiserepeat > 1) {\n            this.raiseCount = 0;\n            this.raiserepeat--;\n          } else {\n            this.raiseCount = 1;\n          }\n        }\n      }\n    }\n\n    return {\n      // 圆柱体的拾取高亮是否要计算光照\n      u_pickLight: Number(pickLight),\n      // 圆柱体是否固定高度\n      u_heightfixed: Number(heightfixed),\n\n      u_r: animateOption.enable && this.raiserepeat > 0 ? this.raiseCount : 1.0,\n\n      u_dataTexture: this.dataTexture, // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]\n      u_cellTypeLayout: this.getCellTypeLayout(),\n\n      u_opacity: isNumber(opacity) ? opacity : 1.0,\n\n      // 渐变色支持参数\n      u_linearColor: useLinearColor,\n      u_sourceColor: sourceColorArr,\n      u_targetColor: targetColorArr,\n\n      // 透明度渐变\n      u_opacitylinear: Number(opacityLinear.enable),\n      u_opacitylinear_dir: opacityLinear.dir === 'up' ? 1.0 : 0.0,\n\n      // 光照计算开关\n      u_lightEnable: Number(lightEnable),\n    };\n  }\n  public initModels(): IModel[] {\n    return this.buildModels();\n  }\n\n  public buildModels(): IModel[] {\n    // GAODE1.x GAODE2.x MAPBOX\n    const {\n      depth = true,\n      animateOption: { repeat = 1 },\n    } = this.layer.getLayerConfig() as ILayerConfig;\n    this.raiserepeat = repeat;\n    return [\n      this.layer.buildLayerModel({\n        moduleName: 'pointExtrude2',\n        vertexShader: pointExtrudeVert,\n        fragmentShader: pointExtrudeFrag,\n        triangulation: PointExtrudeTriangulation,\n        blend: this.getBlend(),\n        cull: {\n          enable: true,\n          face: getCullFace(this.mapService.version),\n        },\n        depth: {\n          enable: depth,\n        },\n      }),\n    ];\n  }\n  public clearModels() {\n    this.dataTexture?.destroy();\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: 3,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          const { size } = feature;\n          if (size) {\n            let buffersize: number[] = [];\n            if (Array.isArray(size)) {\n              buffersize =\n                size.length === 2 ? [size[0], size[0], size[1]] : size;\n            }\n            if (!Array.isArray(size)) {\n              buffersize = [size, size, size];\n            }\n            return buffersize;\n          } else {\n            return [2, 2, 2];\n          }\n        },\n      },\n    });\n\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'normal',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Normal',\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          return normal;\n        },\n      },\n    });\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 = calculateCentroid(feature.coordinates);\n          return lglt2xyz([coordinates[0], coordinates[1]]) as [\n            number,\n            number,\n            number,\n          ];\n        },\n      },\n    });\n  }\n}\n"],"file":"earthExtrude.js"}
+{"version":3,"sources":["../../../src/point/models/earthExtrude.ts"],"names":["AttributeType","gl","calculateCentroid","getCullFace","rgb2arr","BaseModel","PointExtrudeTriangulation","lglt2xyz","ExtrudeModel","layer","getLayerConfig","animateOption","enable","speed","repeat","opacity","sourceColor","targetColor","pickLight","heightfixed","opacityLinear","dir","lightEnable","dataTextureTest","dataTextureNeedUpdate","judgeStyleAttributes","encodeData","getEncodedData","calDataFrame","cellLength","cellProperties","data","width","height","rowCount","dataTexture","length","createTexture2D","flipY","format","LUMINANCE","type","FLOAT","useLinearColor","sourceColorArr","targetColorArr","raiseCount","raiserepeat","u_pickLight","Number","u_heightfixed","u_r","u_dataTexture","u_cellTypeLayout","getCellTypeLayout","u_opacity","u_linearColor","u_sourceColor","u_targetColor","u_opacitylinear","u_opacitylinear_dir","u_lightEnable","callbackModel","buildModels","buildLayerModel","moduleName","vertexShader","pointExtrudeVert","fragmentShader","pointExtrudeFrag","triangulation","depth","cull","face","mapService","version","blend","getBlend","then","model","catch","err","console","warn","destroy","styleAttributeService","registerStyleAttribute","name","Attribute","descriptor","buffer","usage","DYNAMIC_DRAW","size","update","feature","featureIdx","vertex","attributeIdx","buffersize","Array","isArray","STATIC_DRAW","normal","coordinates"],"mappings":"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","sourcesContent":["import {\n  AttributeType,\n  gl,\n  IEncodeFeature,\n  ILayerConfig,\n  IModel,\n} from '@antv/l7-core';\nimport { calculateCentroid, getCullFace, rgb2arr } from '@antv/l7-utils';\nimport { isNumber } from 'lodash';\nimport BaseModel from '../../core/BaseModel';\nimport { IPointLayerStyleOptions } from '../../core/interface';\nimport { PointExtrudeTriangulation } from '../../core/triangulation';\nimport { lglt2xyz } from '../../earth/utils';\nimport pointExtrudeFrag from '../shaders/earth/extrude_frag.glsl';\nimport pointExtrudeVert from '../shaders/earth/extrude_vert.glsl';\n\nexport default class ExtrudeModel extends BaseModel {\n  private raiseCount: number = 0;\n  private raiserepeat: number = 0;\n  public getUninforms() {\n    const {\n      animateOption = {\n        enable: false,\n        speed: 0.01,\n        repeat: false,\n      },\n      opacity = 1,\n\n      sourceColor,\n      targetColor,\n\n      pickLight = false,\n      heightfixed = false,\n\n      opacityLinear = {\n        enable: false,\n        dir: 'up',\n      },\n\n      lightEnable = true,\n    } = this.layer.getLayerConfig() as Partial<\n      ILayerConfig & IPointLayerStyleOptions\n    >;\n    if (\n      this.dataTextureTest &&\n      this.dataTextureNeedUpdate({\n        opacity,\n      })\n    ) {\n      this.judgeStyleAttributes({\n        opacity,\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\n    // 转化渐变色\n    let useLinearColor = 0; // 默认不生效\n    let sourceColorArr = [0, 0, 0, 0];\n    let targetColorArr = [0, 0, 0, 0];\n    if (sourceColor && targetColor) {\n      sourceColorArr = rgb2arr(sourceColor);\n      targetColorArr = rgb2arr(targetColor);\n      useLinearColor = 1;\n    }\n\n    if (this.raiseCount < 1 && this.raiserepeat > 0) {\n      if (animateOption.enable) {\n        const { speed = 0.01, repeat = false } = animateOption;\n        this.raiseCount += speed;\n        if (this.raiseCount >= 1) {\n          if (this.raiserepeat > 1) {\n            this.raiseCount = 0;\n            this.raiserepeat--;\n          } else {\n            this.raiseCount = 1;\n          }\n        }\n      }\n    }\n\n    return {\n      // 圆柱体的拾取高亮是否要计算光照\n      u_pickLight: Number(pickLight),\n      // 圆柱体是否固定高度\n      u_heightfixed: Number(heightfixed),\n\n      u_r: animateOption.enable && this.raiserepeat > 0 ? this.raiseCount : 1.0,\n\n      u_dataTexture: this.dataTexture, // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]\n      u_cellTypeLayout: this.getCellTypeLayout(),\n\n      u_opacity: isNumber(opacity) ? opacity : 1.0,\n\n      // 渐变色支持参数\n      u_linearColor: useLinearColor,\n      u_sourceColor: sourceColorArr,\n      u_targetColor: targetColorArr,\n\n      // 透明度渐变\n      u_opacitylinear: Number(opacityLinear.enable),\n      u_opacitylinear_dir: opacityLinear.dir === 'up' ? 1.0 : 0.0,\n\n      // 光照计算开关\n      u_lightEnable: Number(lightEnable),\n    };\n  }\n  public initModels(callbackModel: (models: IModel[]) => void) {\n    this.buildModels(callbackModel);\n  }\n\n  public buildModels(callbackModel: (models: IModel[]) => void) {\n    // GAODE1.x GAODE2.x MAPBOX\n    const {\n      animateOption: { repeat = 1 },\n    } = this.layer.getLayerConfig() as ILayerConfig;\n    this.raiserepeat = repeat;\n\n    this.layer\n      .buildLayerModel({\n        moduleName: 'pointEarthExtrude',\n        vertexShader: pointExtrudeVert,\n        fragmentShader: pointExtrudeFrag,\n        triangulation: PointExtrudeTriangulation,\n        depth: { enable: true },\n        cull: {\n          enable: true,\n          face: getCullFace(this.mapService.version),\n        },\n        blend: this.getBlend(),\n      })\n      .then((model) => {\n        callbackModel([model]);\n      })\n      .catch((err) => {\n        console.warn(err);\n        callbackModel([]);\n      });\n  }\n  public clearModels() {\n    this.dataTexture?.destroy();\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: 3,\n        update: (\n          feature: IEncodeFeature,\n          featureIdx: number,\n          vertex: number[],\n          attributeIdx: number,\n        ) => {\n          const { size } = feature;\n          if (size) {\n            let buffersize: number[] = [];\n            if (Array.isArray(size)) {\n              buffersize =\n                size.length === 2 ? [size[0], size[0], size[1]] : size;\n            }\n            if (!Array.isArray(size)) {\n              buffersize = [size, size, size];\n            }\n            return buffersize;\n          } else {\n            return [2, 2, 2];\n          }\n        },\n      },\n    });\n\n    // point layer size;\n    this.styleAttributeService.registerStyleAttribute({\n      name: 'normal',\n      type: AttributeType.Attribute,\n      descriptor: {\n        name: 'a_Normal',\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          return normal;\n        },\n      },\n    });\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 = calculateCentroid(feature.coordinates);\n          return lglt2xyz([coordinates[0], coordinates[1]]) as [\n            number,\n            number,\n            number,\n          ];\n        },\n      },\n    });\n  }\n}\n"],"file":"earthExtrude.js"}

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

@@ -3,17 +3,8 @@ import BaseModel from '../../core/BaseModel';
 export default class FillModel extends BaseModel {
     getUninforms(): IModelUniform;
     getAnimateUniforms(): IModelUniform;
-    initModels(): IModel[];
-    buildModels(): IModel[];
-    /**
-     * 根据 animateOption 的值返回对应的 shader 代码
-     * @returns
-     */
-    getShaders(): {
-        frag: string;
-        vert: string;
-        type: string;
-    };
+    initModels(callbackModel: (models: IModel[]) => void): void;
+    buildModels(callbackModel: (models: IModel[]) => void): void;
     clearModels(): void;
     protected animateOption2Array(option: Partial<IAnimateOption>): number[];
     protected registerBuiltinAttributes(): void;