@antv/l7-layers 2.19.0 → 2.19.2

package/es/core/BaseLayer.js

@@ -299,7 +299,8 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
                   // @ts-ignore
                   attributeValues,
                   // @ts-ignore
-                  _this3.getLayerConfig()[attributeName]))
+                  attributeField ? undefined : _this3.getLayerConfig()[attributeName] // 设置了字段不需要设置默认值
+                  ))
                 },
                 // @ts-ignore
                 updateOptions);
@@ -1475,7 +1476,7 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     key: "splitValuesAndCallbackInAttribute",
     value: function splitValuesAndCallbackInAttribute(valuesOrCallback, defaultValues) {
       return {
-        values: isFunction(valuesOrCallback) ? undefined : valuesOrCallback || defaultValues,
+        values: isFunction(valuesOrCallback) ? undefined : valuesOrCallback,
         callback: isFunction(valuesOrCallback) ? valuesOrCallback : undefined
       };
     }

package/es/plugins/FeatureScalePlugin.js

@@ -252,6 +252,9 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
           // text 为内置变 如果是文本则为cat
           type = ScaleTypes.CAT;
         }
+        if (values === undefined) {
+          type = ScaleTypes.IDENTITY;
+        }
         var cfg = this.createScaleConfig(type, field, scaleOption, data);
         styleScale.scale = this.createDefaultScale(cfg);
         styleScale.option = cfg;

package/es/polygon/index.js

@@ -22,7 +22,9 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "type", 'PolygonLayer');
-    _defineProperty(_assertThisInitialized(_this), "enableShaderEncodeStyles", ['opacity', 'extrusionBase']);
+    _defineProperty(_assertThisInitialized(_this), "enableShaderEncodeStyles", ['opacity', 'extrusionBase',
+    // shape 为文本时
+    'rotation', 'offsets', 'stroke']);
     return _this;
   }
   _createClass(PolygonLayer, [{

package/es/polygon/models/extrusion.js

@@ -14,7 +14,7 @@ import { PolygonExtrudeTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/extrusion/polygon_extrusion_frag.glsl' */
 var polygonExtrudeFrag = "\nuniform float u_opacity: 1.0;\nvarying vec4 v_Color;\nvarying vec2 v_texture_data;\n\n\n#pragma include \"picking\"\n\nvoid main() {\n\n  gl_FragColor = v_Color;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/extrusion/polygon_extrusion_vert.glsl' */
-var polygonExtrudeVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nuniform mat4 u_ModelMatrix;\n\n\n\n\nvarying vec4 v_Color;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n \n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase * 1.5, 1.0);\n  float lightWeight = calc_lighting(pos);\n  vec4 project_pos = project_position(pos);\n  // project_pos.z += extrusionBase * 2.0;\n  v_Color = a_Color;\n  v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
+var polygonExtrudeVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nuniform mat4 u_ModelMatrix;\n\n\n\n\nvarying vec4 v_Color;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n \n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase, 1.0);\n  float lightWeight = calc_lighting(pos);\n  vec4 project_pos = project_position(pos);\n  v_Color = a_Color;\n  v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
 var ExtrusionModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(ExtrusionModel, _BaseModel);
   var _super = _createSuper(ExtrusionModel);

package/es/polygon/shaders/extrusion/polygon_extrusion_vert.glsl

@@ -21,10 +21,9 @@ varying vec4 v_Color;
 
 void main() {
  
-  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase * 1.5, 1.0);
+  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase, 1.0);
   float lightWeight = calc_lighting(pos);
   vec4 project_pos = project_position(pos);
-  // project_pos.z += extrusionBase * 2.0;
   v_Color = a_Color;
   v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);
 

package/lib/core/BaseLayer.js

@@ -305,7 +305,8 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
                   // @ts-ignore
                   attributeValues,
                   // @ts-ignore
-                  _this3.getLayerConfig()[attributeName]))
+                  attributeField ? undefined : _this3.getLayerConfig()[attributeName] // 设置了字段不需要设置默认值
+                  ))
                 },
                 // @ts-ignore
                 updateOptions);
@@ -1481,7 +1482,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     key: "splitValuesAndCallbackInAttribute",
     value: function splitValuesAndCallbackInAttribute(valuesOrCallback, defaultValues) {
       return {
-        values: isFunction(valuesOrCallback) ? undefined : valuesOrCallback || defaultValues,
+        values: isFunction(valuesOrCallback) ? undefined : valuesOrCallback,
         callback: isFunction(valuesOrCallback) ? valuesOrCallback : undefined
       };
     }

package/lib/plugins/FeatureScalePlugin.js

@@ -262,6 +262,9 @@ var FeatureScalePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
           // text 为内置变 如果是文本则为cat
           type = _l7Core.ScaleTypes.CAT;
         }
+        if (values === undefined) {
+          type = _l7Core.ScaleTypes.IDENTITY;
+        }
         var cfg = this.createScaleConfig(type, field, scaleOption, data);
         styleScale.scale = this.createDefaultScale(cfg);
         styleScale.option = cfg;

package/lib/polygon/index.js

@@ -29,7 +29,9 @@ 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), "enableShaderEncodeStyles", ['opacity', 'extrusionBase']);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableShaderEncodeStyles", ['opacity', 'extrusionBase',
+    // shape 为文本时
+    'rotation', 'offsets', 'stroke']);
     return _this;
   }
   (0, _createClass2.default)(PolygonLayer, [{

package/lib/polygon/models/extrusion.js

@@ -21,7 +21,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 /* babel-plugin-inline-import '../shaders/extrusion/polygon_extrusion_frag.glsl' */
 var polygonExtrudeFrag = "\nuniform float u_opacity: 1.0;\nvarying vec4 v_Color;\nvarying vec2 v_texture_data;\n\n\n#pragma include \"picking\"\n\nvoid main() {\n\n  gl_FragColor = v_Color;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/extrusion/polygon_extrusion_vert.glsl' */
-var polygonExtrudeVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nuniform mat4 u_ModelMatrix;\n\n\n\n\nvarying vec4 v_Color;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n \n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase * 1.5, 1.0);\n  float lightWeight = calc_lighting(pos);\n  vec4 project_pos = project_position(pos);\n  // project_pos.z += extrusionBase * 2.0;\n  v_Color = a_Color;\n  v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
+var polygonExtrudeVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nuniform mat4 u_ModelMatrix;\n\n\n\n\nvarying vec4 v_Color;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n \n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase, 1.0);\n  float lightWeight = calc_lighting(pos);\n  vec4 project_pos = project_position(pos);\n  v_Color = a_Color;\n  v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
 var ExtrusionModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(ExtrusionModel, _BaseModel);
   var _super = _createSuper(ExtrusionModel);

package/lib/polygon/shaders/extrusion/polygon_extrusion_vert.glsl

@@ -21,10 +21,9 @@ varying vec4 v_Color;
 
 void main() {
  
-  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase * 1.5, 1.0);
+  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size + (1.0 - a_Position.z) * extrusionBase, 1.0);
   float lightWeight = calc_lighting(pos);
   vec4 project_pos = project_position(pos);
-  // project_pos.z += extrusionBase * 2.0;
   v_Color = a_Color;
   v_Color = vec4(v_Color.rgb * lightWeight, v_Color.w * opacity);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.19.0",
+  "version": "2.19.2",
   "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.19.0",
-    "@antv/l7-maps": "2.19.0",
-    "@antv/l7-source": "2.19.0",
-    "@antv/l7-utils": "2.19.0",
+    "@antv/l7-core": "2.19.2",
+    "@antv/l7-maps": "2.19.2",
+    "@antv/l7-source": "2.19.2",
+    "@antv/l7-utils": "2.19.2",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -52,7 +52,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.19.0",
+    "@antv/l7-test-utils": "2.19.2",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "7f08eaafe2a25e986ba52c625acf5511f1184b82",
+  "gitHead": "bb4874bc2e888d843be4946a9990b0add4570fa1",
   "publishConfig": {
     "access": "public"
   }