@antv/l7-layers 2.13.4 → 2.13.6

package/es/core/BaseLayer.d.ts

@@ -1,5 +1,5 @@
 import { AsyncSeriesBailHook, AsyncWaterfallHook, SyncBailHook, SyncHook } from '@antv/async-hook';
-import { BlendType, IActiveOption, IAnimateOption, IAttributeAndElements, ICameraService, ICoordinateSystemService, IDataState, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerAttributesOption, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPickService, ILayerPlugin, ILayerService, ILegend, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IParseDataItem, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, ITextureService, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
+import { BlendType, IActiveOption, IAnimateOption, IAttributeAndElements, ICameraService, ICoordinateSystemService, IDataState, IDebugService, IEncodeFeature, IFontService, IGlobalConfigService, IIconService, IInteractionService, ILayer, ILayerAttributesOption, ILayerConfig, ILayerModel, ILayerModelInitializationOptions, ILayerPickService, ILayerPlugin, ILayerService, ILegend, IMapService, IModel, IModelInitializationOptions, IMultiPassRenderer, IParseDataItem, IPass, IPickingService, IPostProcessingPass, IRendererService, IScale, IScaleOptions, IShaderModuleService, ISourceCFG, IStyleAttributeService, IStyleAttributeUpdateOptions, ITextureService, LayerEventType, LegendItems, StyleAttributeField, StyleAttributeOption, Triangulation } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { EventEmitter } from 'eventemitter3';
 import { Container } from 'inversify';
@@ -71,6 +71,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     protected pickingService: IPickingService;
     protected rendererService: IRendererService;
     protected layerService: ILayerService;
+    protected debugService: IDebugService;
     protected interactionService: IInteractionService;
     protected mapService: IMapService;
     styleAttributeService: IStyleAttributeService;
@@ -116,6 +117,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     getContainer(): Container;
     addPlugin(plugin: ILayerPlugin): ILayer;
     init(): Promise<void>;
+    log(logType: string, time?: number): void;
     updateModelData(data: IAttributeAndElements): void;
     createModelData(data: any, option?: ISourceCFG): any;
     setLayerPickService(layerPickService: ILayerPickService): void;

package/es/core/BaseLayer.js

@@ -30,7 +30,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 // @ts-ignore
 import { AsyncSeriesBailHook, AsyncWaterfallHook, SyncBailHook, SyncHook } from '@antv/async-hook';
-import { BlendType, lazyInject, TYPES } from '@antv/l7-core';
+import { BlendType, IDebugLog, lazyInject, TYPES } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { encodePickingColor, WorkerSourceMap } from '@antv/l7-utils';
 import { EventEmitter } from 'eventemitter3';
@@ -274,6 +274,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                 this.fontService = this.container.get(TYPES.IFontService);
                 this.rendererService = this.container.get(TYPES.IRendererService);
                 this.layerService = this.container.get(TYPES.ILayerService);
+                this.debugService = this.container.get(TYPES.IDebugService);
                 this.interactionService = this.container.get(TYPES.IInteractionService);
                 this.pickingService = this.container.get(TYPES.IPickingService);
                 this.mapService = this.container.get(TYPES.IMapService);
@@ -343,12 +344,14 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
                 this.layerPickService = new LayerPickService(this); // 颜色纹理服务
 
-                this.textureService = new TextureService(this); // 触发 init 生命周期插件
+                this.textureService = new TextureService(this);
+                this.log(IDebugLog.LayerInitStart); // 触发 init 生命周期插件
 
-                _context.next = 29;
+                _context.next = 31;
                 return this.hooks.init.promise();
 
-              case 29:
+              case 31:
+                this.log(IDebugLog.LayerInitEnd);
                 this.inited = true; // 触发初始化完成事件;
 
                 this.emit('inited', {
@@ -361,7 +364,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                 });
                 this.hooks.afterInit.call();
 
-              case 33:
+              case 36:
               case "end":
                 return _context.stop();
             }
@@ -375,6 +378,26 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       return init;
     }()
+  }, {
+    key: "log",
+    value: function log(logType, time) {
+      // @ts-ignore 瓦片、瓦片图层目前不参与日志
+      if (this.tileLayer || this.isTileLayer) {
+        return;
+      }
+
+      var key = "".concat(this.id, ".").concat(logType);
+      var values = {
+        id: this.id,
+        type: this.type
+      };
+
+      if (time) {
+        values.time = time;
+      }
+
+      this.debugService.log(key, values);
+    }
   }, {
     key: "updateModelData",
     value: function updateModelData(data) {
@@ -1008,7 +1031,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
       (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 ? void 0 : _this$layerModel2.clearModels(refresh);
       (_this$tileLayer = this.tileLayer) === null || _this$tileLayer === void 0 ? void 0 : _this$tileLayer.destroy();
-      this.models = [];
+      this.models = []; // 清除图层日志（如果有的话：非瓦片相关）
+
+      this.debugService.removeLog(this.id);
       this.emit('remove', {
         target: this,
         type: 'remove'

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

@@ -1,6 +1,7 @@
 import { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class LineModel extends BaseModel {
+    private textureEventFlag;
     protected texture: ITexture2D;
     getUninforms(): IModelUniform;
     getAnimateUniforms(): IModelUniform;

package/es/line/models/line.js

@@ -54,6 +54,8 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
 
     _this = _super.call.apply(_super, [this].concat(args));
 
+    _defineProperty(_assertThisInitialized(_this), "textureEventFlag", false);
+
     _defineProperty(_assertThisInitialized(_this), "texture", _this.createTexture2D({
       data: [0, 0, 0, 0],
       mag: gl.NEAREST,
@@ -236,13 +238,17 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                // this.updateTexture();
+                // this.iconService.on('imageUpdate', this.updateTexture);
+                if (!this.textureEventFlag) {
+                  this.textureEventFlag = true;
+                  this.updateTexture();
+                  this.iconService.on('imageUpdate', this.updateTexture);
+                }
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
+                return _context.abrupt("return", this.buildModels());
 
-              case 3:
+              case 2:
               case "end":
                 return _context.stop();
             }

package/es/plugins/DataMappingPlugin.js

@@ -10,7 +10,7 @@ import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWar
 var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
 
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { TYPES } from '@antv/l7-core';
+import { IDebugLog, TYPES } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
 import { normalize, rgb2arr } from '@antv/l7-utils';
 import { inject, injectable } from 'inversify';
@@ -36,12 +36,15 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                // 初始化重新生成 map
+                layer.log(IDebugLog.MappingStart); // 初始化重新生成 map
+
                 _this.generateMaping(layer, {
                   styleAttributeService: styleAttributeService
                 });
 
-              case 1:
+                layer.log(IDebugLog.MappingEnd);
+
+              case 3:
               case "end":
                 return _context.stop();
             }

package/es/plugins/DataSourcePlugin.js

@@ -5,7 +5,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 var _dec, _class;
 
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { TYPES } from '@antv/l7-core';
+import { IDebugLog, TYPES } from '@antv/l7-core';
 import Source from '@antv/l7-source';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
@@ -27,6 +27,7 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                layer.log(IDebugLog.SourceInitStart);
                 source = layer.getSource();
 
                 if (!source) {
@@ -37,28 +38,31 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
                 }
 
                 if (!source.inited) {
-                  _context.next = 6;
+                  _context.next = 8;
                   break;
                 }
 
                 _this.updateClusterData(layer);
 
-                _context.next = 8;
+                layer.log(IDebugLog.SourceInitEnd);
+                _context.next = 10;
                 break;
 
-              case 6:
-                _context.next = 8;
+              case 8:
+                _context.next = 10;
                 return new Promise(function (resolve) {
                   source.on('update', function (e) {
                     if (e.type === 'inited') {
                       _this.updateClusterData(layer);
+
+                      layer.log(IDebugLog.SourceInitEnd);
                     }
 
                     resolve(null);
                   });
                 });
 
-              case 8:
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -67,7 +71,7 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
       }))); // 检测数据是否需要更新
 
       layer.hooks.beforeRenderData.tapPromise('DataSourcePlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var neeUpdateCluster, dataSourceNeedUpdate;
+        var neeUpdateCluster, dataSourceNeedUpdate, needScale;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -75,9 +79,10 @@ var DataSourcePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
                 neeUpdateCluster = _this.updateClusterData(layer);
                 dataSourceNeedUpdate = layer.dataState.dataSourceNeedUpdate;
                 layer.dataState.dataSourceNeedUpdate = false;
-                return _context2.abrupt("return", neeUpdateCluster || dataSourceNeedUpdate);
+                needScale = neeUpdateCluster || dataSourceNeedUpdate;
+                return _context2.abrupt("return", needScale);
 
-              case 4:
+              case 5:
               case "end":
                 return _context2.stop();
             }

package/es/plugins/FeatureScalePlugin.js

@@ -7,7 +7,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _scaleMap, _dec, _class;
 
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { ScaleTypes, StyleScaleType } from '@antv/l7-core';
+import { IDebugLog, ScaleTypes, StyleScaleType } from '@antv/l7-core';
 import { extent } from 'd3-array';
 import * as d3interpolate from 'd3-interpolate';
 import * as d3 from 'd3-scale';
@@ -42,21 +42,25 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                layer.log(IDebugLog.ScaleInitStart);
                 _this.scaleOptions = layer.getScaleOptions();
                 attributes = styleAttributeService.getLayerStyleAttributes();
                 dataArray = (_layer$getSource = layer.getSource()) === null || _layer$getSource === void 0 ? void 0 : _layer$getSource.data.dataArray;
 
                 if (!(Array.isArray(dataArray) && dataArray.length === 0)) {
-                  _context.next = 7;
+                  _context.next = 8;
                   break;
                 }
 
                 return _context.abrupt("return");
 
-              case 7:
+              case 8:
                 _this.caculateScalesForAttributes(attributes || [], dataArray);
 
-              case 8:
+              case 9:
+                layer.log(IDebugLog.ScaleInitEnd);
+
+              case 10:
               case "end":
                 return _context.stop();
             }

package/es/plugins/LayerModelPlugin.d.ts

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

package/es/plugins/LayerModelPlugin.js

@@ -5,6 +5,7 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 var _dec, _class;
 
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { IDebugLog } from '@antv/l7-core';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
 import TileLayer from "../tile/tileLayer/BaseLayer";
@@ -18,9 +19,9 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
   }
 
   _createClass(LayerModelPlugin, [{
-    key: "initLayerModel",
+    key: "build",
     value: function () {
-      var _initLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
+      var _build = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(layer) {
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -32,9 +33,6 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
                 return layer.buildModels();
 
               case 3:
-                layer.styleNeedUpdate = false;
-
-              case 4:
               case "end":
                 return _context.stop();
             }
@@ -42,36 +40,60 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
         }, _callee);
       }));
 
-      function initLayerModel(_x) {
-        return _initLayerModel.apply(this, arguments);
+      function build(_x) {
+        return _build.apply(this, arguments);
       }
 
-      return initLayerModel;
+      return build;
     }()
   }, {
-    key: "prepareLayerModel",
+    key: "initLayerModel",
     value: function () {
-      var _prepareLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layer) {
+      var _initLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(layer) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                // 更新Model 配置项
-                layer.prepareBuildModel(); // clear layerModel resource
-                // 初始化 Model
+                _context2.next = 2;
+                return this.build(layer);
 
-                _context2.next = 3;
-                return layer.buildModels();
+              case 2:
+                layer.styleNeedUpdate = false;
 
               case 3:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2);
+        }, _callee2, this);
+      }));
+
+      function initLayerModel(_x2) {
+        return _initLayerModel.apply(this, arguments);
+      }
+
+      return initLayerModel;
+    }()
+  }, {
+    key: "prepareLayerModel",
+    value: function () {
+      var _prepareLayerModel = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(layer) {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                _context3.next = 2;
+                return this.build(layer);
+
+              case 2:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3, this);
       }));
 
-      function prepareLayerModel(_x2) {
+      function prepareLayerModel(_x3) {
         return _prepareLayerModel.apply(this, arguments);
       }
 
@@ -82,69 +104,73 @@ var LayerModelPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function
     value: function apply(layer) {
       var _this = this;
 
-      layer.hooks.init.tapPromise('LayerModelPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+      layer.hooks.init.tapPromise('LayerModelPlugin', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
                 if (!layer.getSource().isTile) {
-                  _context3.next = 4;
+                  _context4.next = 4;
                   break;
                 }
 
                 layer.prepareBuildModel();
                 layer.tileLayer = new TileLayer(layer);
-                return _context3.abrupt("return");
+                return _context4.abrupt("return");
 
               case 4:
-                _context3.next = 6;
+                layer.log(IDebugLog.BuildModelStart);
+                _context4.next = 7;
                 return _this.initLayerModel(layer);
 
-              case 6:
+              case 7:
+                layer.log(IDebugLog.BuildModelEnd);
+
+              case 8:
               case "end":
-                return _context3.stop();
+                return _context4.stop();
             }
           }
-        }, _callee3);
+        }, _callee4);
       })));
       layer.hooks.beforeRenderData.tapPromise('LayerModelPlugin', /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(flag) {
-          return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(flag) {
+          return _regeneratorRuntime.wrap(function _callee5$(_context5) {
             while (1) {
-              switch (_context4.prev = _context4.next) {
+              switch (_context5.prev = _context5.next) {
                 case 0:
                   if (flag) {
-                    _context4.next = 2;
+                    _context5.next = 2;
                     break;
                   }
 
-                  return _context4.abrupt("return", false);
+                  return _context5.abrupt("return", false);
 
                 case 2:
                   if (!layer.getSource().isTile) {
-                    _context4.next = 5;
+                    _context5.next = 5;
                     break;
                   }
 
                   layer.tileLayer = new TileLayer(layer);
-                  return _context4.abrupt("return", false);
+                  return _context5.abrupt("return", false);
 
                 case 5:
-                  _context4.next = 7;
+                  _context5.next = 7;
                   return _this.prepareLayerModel(layer);
 
                 case 7:
-                  return _context4.abrupt("return", true);
+                  return _context5.abrupt("return", true);
 
                 case 8:
                 case "end":
-                  return _context4.stop();
+                  return _context5.stop();
               }
             }
-          }, _callee4);
+          }, _callee5);
         }));
 
-        return function (_x3) {
+        return function (_x4) {
           return _ref2.apply(this, arguments);
         };
       }());

package/es/point/models/fill.js

@@ -14,9 +14,9 @@ import { AttributeType, gl } from '@antv/l7-core';
 import { getMask, PointFillTriangulation } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
+import { SizeUnitType } from "../../core/interface"; // animate pointLayer shader - support animate
 
 /* babel-plugin-inline-import '../shaders/animate/wave_frag.glsl' */
-// animate pointLayer shader - support animate
 var waveFillFrag = "\nuniform float u_additive;\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\nuniform float u_time;\nuniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\n\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nvoid main() {\n\n  vec4 textrueStroke = vec4(\n    styleMappingMat[1][0],\n    styleMappingMat[1][1],\n    styleMappingMat[1][2],\n    styleMappingMat[1][3]\n  );\n\n  float opacity = styleMappingMat[0][0];\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius);\n\n  float outer_df;\n  float inner_df;\n  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n  \n  outer_df = sdCircle(v_data.xy, 1.0);\n  inner_df = sdCircle(v_data.xy, r);\n\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n  float PI = 3.14159;\n  float N_RINGS = 3.0;\n  float FREQ = 1.0;\n\n gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);\n\n  float d = length(v_data.xy);\n  if(d > 0.5) {\n    discard;\n  }\n  float intensity = clamp(cos(d * PI), 0.0, 1.0) * clamp(cos(2.0 * PI * (d * 2.0 * u_animate.z - u_animate.y * u_time)), 0.0, 1.0);\n  \n  // \u6839\u636E\u53E0\u52A0\u6A21\u5F0F\u9009\u62E9\u6548\u679C\n  if(u_additive > 0.0) {\n    gl_FragColor *= intensity;\n    // \u4F18\u5316\u6C34\u6CE2\u70B9 blend additive \u6A21\u5F0F\u4E0B\u6709\u7684\u62FE\u53D6\u6548\u679C \n    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);\n  } else {\n    gl_FragColor = vec4(gl_FragColor.xyz, gl_FragColor.a * intensity);\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n"; // static pointLayer shader - not support animate
 
 /* babel-plugin-inline-import '../shaders/fill_frag.glsl' */
@@ -24,7 +24,6 @@ var pointFillFrag = "uniform float u_additive;\n\nvarying mat4 styleMappingMat;
 
 /* babel-plugin-inline-import '../shaders/fill_vert.glsl' */
 var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform int u_Size_Unit;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\nuniform vec2 u_offsets;\n\nuniform float u_blur : 0.0;\nuniform float u_raisingHeight: 0.0;\nuniform float u_heightfixed: 0.0;\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  /*\n  *  setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n  *  u_meter2coord \u5728\u7B49\u9762\u79EF\u5927\u5C0F\u7684\u65F6\u5019\u8BBE\u7F6E\u5355\u4F4D\n  */\n  float newSize = setPickingSize(a_Size);\n  // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\n\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  styleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n\n  vec2 strokeOpacityAndOffset = calStrokeOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][1] = strokeOpacityAndOffset.r;\n  textureOffset = strokeOpacityAndOffset.g;\n\n  vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][2] = strokeWidthAndOffset.r;\n  textureOffset = strokeWidthAndOffset.g;\n\n  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);\n  if(hasStroke()) {\n    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R\n    textureOffset += 1.0;\n\n    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G\n    textureOffset += 1.0;\n\n    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B\n    textureOffset += 1.0;\n\n    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A\n    textureOffset += 1.0;\n  } else {\n    if(u_stroke_color == vec4(0.0)) {\n      styleMappingMat[1][0] = v_color.r;\n      styleMappingMat[1][1] = v_color.g;\n      styleMappingMat[1][2] = v_color.b;\n      styleMappingMat[1][3] = v_color.a;\n    } else {\n      styleMappingMat[1][0] = u_stroke_color.r;\n      styleMappingMat[1][1] = u_stroke_color.g;\n      styleMappingMat[1][2] = u_stroke_color.b;\n      styleMappingMat[1][3] = u_stroke_color.a;\n    }\n  }\n\n  vec2 textrueOffsets = vec2(0.0, 0.0);\n  if(hasOffsets()) {\n    vec2 valueXPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.r = pos2value(valueXPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n\n    vec2 valueYPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.g = pos2value(valueYPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n  } else {\n    textrueOffsets = u_offsets;\n  }\n\n  // cal style mapping\n\n  // unpack color(vec2)\n  v_color = a_Color;\nif(u_Size_Unit == 1) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n\n   v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);\n\n  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + textrueOffsets);\n  vec3 aPosition = a_Position;\n\n  offset = project_pixel(offset);\n  \n  // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n\n  // vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  float raisingHeight = u_raisingHeight;\n\n  if(u_heightfixed < 1.0) { // false\n    raisingHeight = project_pixel(u_raisingHeight);\n  } else {\n     if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      raisingHeight = u_raisingHeight * mapboxZoomScale;\n    }\n  }\n \n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position =  u_Mvp * vec4(project_pos.xy + offset, raisingHeight, 1.0);\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));\n  }\n \n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
-import { SizeUnitType } from "../../core/interface";
 
 var FillModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(FillModel, _BaseModel);
@@ -145,13 +144,9 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 2:
-                return _context.abrupt("return", _context.sent);
-
-              case 3:
+              case 1:
               case "end":
                 return _context.stop();
             }

package/es/point/models/fillmage.js

@@ -16,6 +16,7 @@ import { AttributeType, gl } from '@antv/l7-core';
 import { getCullFace, getMask } from '@antv/l7-utils';
 import { isNumber } from 'lodash';
 import BaseModel from "../../core/BaseModel";
+import { SizeUnitType } from "../../core/interface";
 import { PointFillTriangulation } from "../../core/triangulation"; // static pointLayer shader - not support animate
 
 /* babel-plugin-inline-import '../shaders/image/fillImage_frag.glsl' */
@@ -23,7 +24,6 @@ var pointFillFrag = "uniform sampler2D u_texture;\nuniform vec2 u_textSize;\n\nv
 
 /* babel-plugin-inline-import '../shaders/image/fillImage_vert.glsl' */
 var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute vec2 a_Uv;\nattribute float a_Rotate;\n\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform mat2 u_RotateMatrix;\nuniform int u_Size_Unit;\n\nvarying vec2 v_uv; // \u672C\u8EAB\u7684 uv \u5750\u6807\nvarying vec2 v_Iconuv; // icon \u8D34\u56FE\u7684 uv \u5750\u6807\n\nuniform float u_raisingHeight: 0.0;\nuniform float u_heightfixed: 0.0;\nuniform float u_opacity : 1;\nuniform vec2 u_offsets;\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n\n  v_uv = (a_Extrude.xy + 1.0)/2.0;\n  v_uv.y = 1.0 - v_uv.y;\n  v_Iconuv = a_Uv;\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 - empty - empty - empty\n    0.0, 0.0, 0.0, 0.0, // empty - empty - empty - empty\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n\n  vec2 textrueOffsets = vec2(0.0, 0.0);\n  if(hasOffsets()) {\n    vec2 valueXPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.r = pos2value(valueXPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n\n    vec2 valueYPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    textrueOffsets.g = pos2value(valueYPos, columnWidth, rowHeight); // x\n    textureOffset += 1.0;\n  } else {\n    textrueOffsets = u_offsets;\n  }\n\n  // cal style mapping\n\n  highp float angle_sin = sin(a_Rotate);\n  highp float angle_cos = cos(a_Rotate);\n  mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);\n  float newSize = a_Size;\n  if(u_Size_Unit == 1) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n\n  // vec2 offset = (u_RotateMatrix * extrude.xy * (a_Size) + textrueOffsets);\n  vec2 offset = (rotation_matrix * u_RotateMatrix * extrude.xy * (newSize) + textrueOffsets);\n  vec3 aPosition = a_Position;\n\n  offset = project_pixel(offset);\n\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  float raisingHeight = u_raisingHeight;\n  if(u_heightfixed < 1.0) { // height fixed\n    raisingHeight = project_pixel(u_raisingHeight);\n  } else {\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      raisingHeight = u_raisingHeight * mapboxZoomScale;\n    }\n  }\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp *vec4(project_pos.xy + offset, raisingHeight, 1.0);\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, raisingHeight, 1.0));\n  }\n \n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
-import { SizeUnitType } from "../../core/interface";
 
 var FillImageModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(FillImageModel, _BaseModel);
@@ -180,13 +180,9 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.iconService.on('imageUpdate', this.updateTexture);
                 this.updateTexture();
-                _context.next = 4;
-                return this.buildModels();
-
-              case 4:
-                return _context.abrupt("return", _context.sent);
+                return _context.abrupt("return", this.buildModels());
 
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -297,8 +293,8 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
             var shape = feature.shape;
 
             var _ref3 = iconMap[shape] || {
-              x: 0,
-              y: 0
+              x: -64,
+              y: -64
             },
                 x = _ref3.x,
                 y = _ref3.y;

package/es/point/models/image.js

@@ -147,13 +147,9 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
               case 0:
                 this.iconService.on('imageUpdate', this.updateTexture);
                 this.updateTexture();
-                _context.next = 4;
-                return this.buildModels();
+                return _context.abrupt("return", this.buildModels());
 
-              case 4:
-                return _context.abrupt("return", _context.sent);
-
-              case 5:
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -263,11 +259,12 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
             var shape = feature.shape;
 
             var _ref3 = iconMap[shape] || {
-              x: 0,
-              y: 0
+              x: -64,
+              y: -64
             },
                 x = _ref3.x,
-                y = _ref3.y;
+                y = _ref3.y; // 非画布区域，默认的图标改为透明
+
 
             return [x, y];
           }

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

@@ -38,6 +38,7 @@ export default class TextModel extends BaseModel {
      * 生成 iconfont 纹理字典
      */
     private initIconFontTex;
+    private getTextStyle;
     /**
      * 生成文字布局（对照文字纹理字典提取对应文字的位置很好信息）
      */