@antv/l7-layers 2.17.5 → 2.17.7

package/es/core/BaseLayer.d.ts

@@ -88,7 +88,9 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
     protected rawConfig: Partial<ILayerConfig & ChildLayerStyleOptions>;
     private needUpdateConfig;
     encodeStyleAttribute: Record<string, any>;
-    enableEncodeStyles: string[];
+    enableShaderEncodeStyles: string[];
+    enableDataEncodeStyles: string[];
+    enablg: string[];
     /**
      * 待更新样式属性，在初始化阶段完成注册
      */

package/es/core/BaseLayer.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
@@ -45,6 +46,10 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
   // 用于保存子图层对象
 
+  // Shader 的数据映射
+
+  // 数据层数据映射
+
   /**
    * 待更新样式属性，在初始化阶段完成注册
    */
@@ -107,7 +112,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     });
     _defineProperty(_assertThisInitialized(_this), "currentPickId", null);
     _defineProperty(_assertThisInitialized(_this), "encodeStyleAttribute", {});
-    _defineProperty(_assertThisInitialized(_this), "enableEncodeStyles", []);
+    _defineProperty(_assertThisInitialized(_this), "enableShaderEncodeStyles", []);
+    _defineProperty(_assertThisInitialized(_this), "enableDataEncodeStyles", []);
+    _defineProperty(_assertThisInitialized(_this), "enablg", []);
     _defineProperty(_assertThisInitialized(_this), "pendingStyleAttributes", []);
     _defineProperty(_assertThisInitialized(_this), "scaleOptions", {});
     _defineProperty(_assertThisInitialized(_this), "animateStatus", false);
@@ -587,13 +594,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       Object.keys(options).forEach(function (key) {
         if (
         // 需要数据映射
-        _this6.enableEncodeStyles.includes(key) &&
-        // 支持的数据映射类型
-        isPlainObject(options[key]) && (
-        //
-        options[key].field || options[key].value) &&
-        // 有数据映射的配置
-        !isEqual(_this6.encodeStyleAttribute[key], options[key]) // 防止计算属性重复计算
+        [_this6.enableShaderEncodeStyles].concat(_toConsumableArray(_this6.enableDataEncodeStyles)).includes(key) && isPlainObject(options[key]) && (options[key].field || options[key].value) && !isEqual(_this6.encodeStyleAttribute[key], options[key]) // 防止计算属性重复计算
         ) {
           _this6.encodeStyleAttribute[key] = options[key];
           _this6.updateStyleAttribute(key, options[key].field, options[key].value);

package/es/core/BaseModel.js

@@ -206,14 +206,14 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         offsets: 'vec2',
         textOffset: 'vec2'
       };
-      this.layer.enableEncodeStyles.forEach(function (key) {
+      this.layer.enableShaderEncodeStyles.forEach(function (key) {
         if (encodeStyleAttribute[key]) {
           str += "#define USE_ATTRIBUTE_".concat(key.toUpperCase(), " 0.0; \n\n");
         }
-        str += "\n      #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n  attribute ").concat(attrType[key], " a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n#else\n  uniform ").concat(attrType[key], " u_").concat(key, ";\n#endif\n\n");
+        str += "\n          #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n      attribute ").concat(attrType[key], " a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n    #else\n      uniform ").concat(attrType[key], " u_").concat(key, ";\n    #endif\n\n    ");
       });
       var innerStr = '';
-      this.layer.enableEncodeStyles.forEach(function (key) {
+      this.layer.enableShaderEncodeStyles.forEach(function (key) {
         innerStr += "\n\n#ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n  ").concat(attrType[key], " ").concat(key, "  = a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n#else\n  ").concat(attrType[key], " ").concat(key, " = u_").concat(key, ";\n#endif\n\n");
       });
       return {
@@ -235,7 +235,7 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         stroke: [1, 0, 0, 1],
         offsets: [0, 0]
       };
-      this.layer.enableEncodeStyles.forEach(function (key) {
+      this.layer.enableShaderEncodeStyles.forEach(function (key) {
         if (!_this.layer.encodeStyleAttribute[key]) {
           // @ts-ignore
           var keyValue = _this.layer.getLayerConfig()[key];

package/es/line/index.d.ts

@@ -4,7 +4,7 @@ import { ILineLayerStyleOptions } from '../core/interface';
 import { LineModelType } from './models';
 export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
     type: string;
-    enableEncodeStyles: string[];
+    enableShaderEncodeStyles: string[];
     arrowInsertCount: number;
     defaultSourceConfig: {
         data: {

package/es/line/index.js

@@ -23,7 +23,7 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "type", 'LineLayer');
-    _defineProperty(_assertThisInitialized(_this), "enableEncodeStyles", ['opacity', 'offsets', 'stroke']);
+    _defineProperty(_assertThisInitialized(_this), "enableShaderEncodeStyles", ['opacity', 'offsets', 'stroke']);
     _defineProperty(_assertThisInitialized(_this), "arrowInsertCount", 0);
     _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
       data: [{

package/es/line/models/arc_3d.js

@@ -61,7 +61,7 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
   _createClass(Arc3DModel, [{
     key: "getUninforms",
     value:
-    // public enableEncodeStyles = ['opacity'];
+    // public enableShaderEncodeStyles = ['opacity'];
     function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
         sourceColor = _ref.sourceColor,

package/es/point/index.d.ts

@@ -3,7 +3,8 @@ import { IPointLayerStyleOptions } from '../core/interface';
 import { PointType } from './models/index';
 export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
     type: string;
-    enableEncodeStyles: string[];
+    enableShaderEncodeStyles: string[];
+    enableDataEncodeStyles: string[];
     defaultSourceConfig: {
         data: never[];
         options: {

package/es/point/index.js

@@ -25,7 +25,8 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "type", 'PointLayer');
-    _defineProperty(_assertThisInitialized(_this), "enableEncodeStyles", ['opacity', 'offsets', 'stroke']);
+    _defineProperty(_assertThisInitialized(_this), "enableShaderEncodeStyles", ['opacity', 'offsets', 'stroke']);
+    _defineProperty(_assertThisInitialized(_this), "enableDataEncodeStyles", ['textOffset', 'textAnchor']);
     _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
       data: [],
       options: {

package/es/point/models/text.js

@@ -86,8 +86,6 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     key: "getUninforms",
     value: function getUninforms() {
       var _ref2 = this.layer.getLayerConfig(),
-        _ref2$opacity = _ref2.opacity,
-        opacity = _ref2$opacity === void 0 ? 1.0 : _ref2$opacity,
         _ref2$stroke = _ref2.stroke,
         stroke = _ref2$stroke === void 0 ? '#fff' : _ref2$stroke,
         _ref2$strokeWidth = _ref2.strokeWidth,
@@ -107,7 +105,6 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
       this.preTextStyle = this.getTextStyle();
       return _objectSpread({
         u_raisingHeight: Number(raisingHeight),
-        // u_opacity: opacity,
         u_stroke_width: strokeWidth,
         u_stroke_color: rgb2arr(stroke),
         u_sdf_map: this.texture,
@@ -456,12 +453,14 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           id = feature.id,
           _feature$size2 = feature.size,
           size = _feature$size2 === void 0 ? 1 : _feature$size2;
+        var offset = feature.textOffset ? feature.textOffset : textOffset || [0, 0];
+        var anchor = feature.textAnchor ? feature.textAnchor : textAnchor || 'center';
         var shaping = shapeText(shape.toString(), mapping,
         // @ts-ignore
-        size, textAnchor, 'left', spacing, textOffset,
-        // || feature['textOffset'] || [0, 0],// TODO: 文字偏移量 CPU 计算
+        size, anchor, 'left', spacing, offset,
+        //
         iconfont);
-        var glyphQuads = getGlyphQuads(shaping, textOffset, false);
+        var glyphQuads = getGlyphQuads(shaping, offset, false);
         feature.shaping = shaping;
         feature.glyphQuads = glyphQuads;
         // feature.centroid = calculteCentroid(coordinates);

package/es/polygon/index.d.ts

@@ -3,7 +3,7 @@ import { IPolygonLayerStyleOptions } from '../core/interface';
 import { PolygonModelType } from './models/';
 export default class PolygonLayer extends BaseLayer<IPolygonLayerStyleOptions> {
     type: string;
-    enableEncodeStyles: string[];
+    enableShaderEncodeStyles: string[];
     defaultSourceConfig: {
         data: [];
         options: {

package/es/polygon/index.js

@@ -22,7 +22,7 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "type", 'PolygonLayer');
-    _defineProperty(_assertThisInitialized(_this), "enableEncodeStyles", ['opacity']);
+    _defineProperty(_assertThisInitialized(_this), "enableShaderEncodeStyles", ['opacity']);
     return _this;
   }
   _createClass(PolygonLayer, [{

package/lib/core/BaseLayer.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -51,6 +52,10 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
   // 用于保存子图层对象
 
+  // Shader 的数据映射
+
+  // 数据层数据映射
+
   /**
    * 待更新样式属性，在初始化阶段完成注册
    */
@@ -113,7 +118,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "currentPickId", null);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "encodeStyleAttribute", {});
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableEncodeStyles", []);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableShaderEncodeStyles", []);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableDataEncodeStyles", []);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enablg", []);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "pendingStyleAttributes", []);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "scaleOptions", {});
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "animateStatus", false);
@@ -593,13 +600,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       Object.keys(options).forEach(function (key) {
         if (
         // 需要数据映射
-        _this6.enableEncodeStyles.includes(key) &&
-        // 支持的数据映射类型
-        (0, _lodash.isPlainObject)(options[key]) && (
-        //
-        options[key].field || options[key].value) &&
-        // 有数据映射的配置
-        !(0, _lodash.isEqual)(_this6.encodeStyleAttribute[key], options[key]) // 防止计算属性重复计算
+        [_this6.enableShaderEncodeStyles].concat((0, _toConsumableArray2.default)(_this6.enableDataEncodeStyles)).includes(key) && (0, _lodash.isPlainObject)(options[key]) && (options[key].field || options[key].value) && !(0, _lodash.isEqual)(_this6.encodeStyleAttribute[key], options[key]) // 防止计算属性重复计算
         ) {
           _this6.encodeStyleAttribute[key] = options[key];
           _this6.updateStyleAttribute(key, options[key].field, options[key].value);

package/lib/core/BaseModel.js

@@ -213,14 +213,14 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         offsets: 'vec2',
         textOffset: 'vec2'
       };
-      this.layer.enableEncodeStyles.forEach(function (key) {
+      this.layer.enableShaderEncodeStyles.forEach(function (key) {
         if (encodeStyleAttribute[key]) {
           str += "#define USE_ATTRIBUTE_".concat(key.toUpperCase(), " 0.0; \n\n");
         }
-        str += "\n      #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n  attribute ").concat(attrType[key], " a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n#else\n  uniform ").concat(attrType[key], " u_").concat(key, ";\n#endif\n\n");
+        str += "\n          #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n      attribute ").concat(attrType[key], " a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n    #else\n      uniform ").concat(attrType[key], " u_").concat(key, ";\n    #endif\n\n    ");
       });
       var innerStr = '';
-      this.layer.enableEncodeStyles.forEach(function (key) {
+      this.layer.enableShaderEncodeStyles.forEach(function (key) {
         innerStr += "\n\n#ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n  ").concat(attrType[key], " ").concat(key, "  = a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n#else\n  ").concat(attrType[key], " ").concat(key, " = u_").concat(key, ";\n#endif\n\n");
       });
       return {
@@ -242,7 +242,7 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         stroke: [1, 0, 0, 1],
         offsets: [0, 0]
       };
-      this.layer.enableEncodeStyles.forEach(function (key) {
+      this.layer.enableShaderEncodeStyles.forEach(function (key) {
         if (!_this.layer.encodeStyleAttribute[key]) {
           // @ts-ignore
           var keyValue = _this.layer.getLayerConfig()[key];

package/lib/line/index.js

@@ -30,7 +30,7 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'LineLayer');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableEncodeStyles", ['opacity', 'offsets', 'stroke']);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableShaderEncodeStyles", ['opacity', 'offsets', 'stroke']);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "arrowInsertCount", 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "defaultSourceConfig", {
       data: [{

package/lib/line/models/arc_3d.js

@@ -68,7 +68,7 @@ var Arc3DModel = /*#__PURE__*/function (_BaseModel) {
   (0, _createClass2.default)(Arc3DModel, [{
     key: "getUninforms",
     value:
-    // public enableEncodeStyles = ['opacity'];
+    // public enableShaderEncodeStyles = ['opacity'];
     function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
         sourceColor = _ref.sourceColor,

package/lib/point/index.js

@@ -32,7 +32,8 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'PointLayer');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableEncodeStyles", ['opacity', 'offsets', 'stroke']);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableShaderEncodeStyles", ['opacity', 'offsets', 'stroke']);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableDataEncodeStyles", ['textOffset', 'textAnchor']);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "defaultSourceConfig", {
       data: [],
       options: {

package/lib/point/models/text.js

@@ -94,8 +94,6 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     key: "getUninforms",
     value: function getUninforms() {
       var _ref2 = this.layer.getLayerConfig(),
-        _ref2$opacity = _ref2.opacity,
-        opacity = _ref2$opacity === void 0 ? 1.0 : _ref2$opacity,
         _ref2$stroke = _ref2.stroke,
         stroke = _ref2$stroke === void 0 ? '#fff' : _ref2$stroke,
         _ref2$strokeWidth = _ref2.strokeWidth,
@@ -115,7 +113,6 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
       this.preTextStyle = this.getTextStyle();
       return (0, _objectSpread2.default)({
         u_raisingHeight: Number(raisingHeight),
-        // u_opacity: opacity,
         u_stroke_width: strokeWidth,
         u_stroke_color: (0, _l7Utils.rgb2arr)(stroke),
         u_sdf_map: this.texture,
@@ -464,12 +461,14 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           id = feature.id,
           _feature$size2 = feature.size,
           size = _feature$size2 === void 0 ? 1 : _feature$size2;
+        var offset = feature.textOffset ? feature.textOffset : textOffset || [0, 0];
+        var anchor = feature.textAnchor ? feature.textAnchor : textAnchor || 'center';
         var shaping = (0, _symbolLayout.shapeText)(shape.toString(), mapping,
         // @ts-ignore
-        size, textAnchor, 'left', spacing, textOffset,
-        // || feature['textOffset'] || [0, 0],// TODO: 文字偏移量 CPU 计算
+        size, anchor, 'left', spacing, offset,
+        //
         iconfont);
-        var glyphQuads = (0, _symbolLayout.getGlyphQuads)(shaping, textOffset, false);
+        var glyphQuads = (0, _symbolLayout.getGlyphQuads)(shaping, offset, false);
         feature.shaping = shaping;
         feature.glyphQuads = glyphQuads;
         // feature.centroid = calculteCentroid(coordinates);

package/lib/polygon/index.js

@@ -29,7 +29,7 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'PolygonLayer');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableEncodeStyles", ['opacity']);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableShaderEncodeStyles", ['opacity']);
     return _this;
   }
   (0, _createClass2.default)(PolygonLayer, [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.17.5",
+  "version": "2.17.7",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-core": "2.17.5",
-    "@antv/l7-maps": "2.17.5",
-    "@antv/l7-source": "2.17.5",
-    "@antv/l7-utils": "2.17.5",
+    "@antv/l7-core": "2.17.7",
+    "@antv/l7-maps": "2.17.7",
+    "@antv/l7-source": "2.17.7",
+    "@antv/l7-utils": "2.17.7",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -53,7 +53,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.17.5",
+    "@antv/l7-test-utils": "2.17.7",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -62,7 +62,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "9da38170fe5ac1bec6a92b5e75f23ecf573c6d9c",
+  "gitHead": "dc2526087e7c2a42fb335c3faa257ede61734e44",
   "publishConfig": {
     "access": "public"
   }