@antv/l7-layers 2.19.10 → 2.19.11

package/lib/line/models/flow.js

@@ -16,13 +16,13 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
-var _triangulation = require("../../core/triangulation");
+var _line_trangluation = require("../../core/line_trangluation");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /* babel-plugin-inline-import '../shaders/flow/flow_line_frag.glsl' */
 var flow_line_frag = "#extension GL_OES_standard_derivatives : enable\n\nvarying vec4 v_color;\n\n\n// line texture\n\n#pragma include \"picking\"\n\nvoid main() {\ngl_FragColor = v_color;\ngl_FragColor = filterColor(gl_FragColor);\n}\n"; // linear simple line shader
 /* babel-plugin-inline-import '../shaders/flow/flow_line_vert.glsl' */
-var flow_line_vert = "attribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec4 a_Instance;\nattribute vec3 a_Normal;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvarying vec4 v_color;\nuniform float u_gap_width: 1.0;\nuniform float u_stroke_width: 1.0;\nuniform float u_stroke_opacity: 1.0;\n\n\nvoid main() {\n\n// \u900F\u660E\u5EA6\u8BA1\u7B97\n  vec2 source = a_Instance.rg;  // \u8D77\u59CB\u70B9\n  vec2 target =  a_Instance.ba; // \u7EC8\u70B9\n  vec2 flowlineDir = normalize(target - source);\n  vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x);\n\n\n  vec2 position = mix(source, target, a_Position.x);\n  \n  float lengthCommon = length(project_position(vec4(target,0,1)) - project_position(vec4(source,0,1)));  //    \n  vec2 offsetDistances = a_Size.x * project_pixel(a_Position.yz);\n  vec2 limitedOffsetDistances = clamp(   \n   offsetDistances,\n   project_pixel(-lengthCommon*.8), project_pixel(lengthCommon*.8)\n  );\n\n\n  float startOffsetCommon = project_pixel(offsets[0]);\n  float endOffsetCommon = project_pixel(offsets[1]);\n  float endpointOffset = mix(\n    clamp(startOffsetCommon, 0.0, lengthCommon*.2),\n    -clamp(endOffsetCommon, 0.0, lengthCommon*.2),\n    a_Position.x\n  );\n\n  vec2 normalsCommon =  u_stroke_width * project_pixel(a_Normal.xy);\n\n  float gapCommon =  project_pixel(u_gap_width);\n  vec3 offsetCommon = vec3(\n    flowlineDir * (limitedOffsetDistances[1] + normalsCommon.y + endpointOffset * 1.05) -\n    perpendicularDir * (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),\n    0.0\n  );\n\n\n  vec4 project_pos = project_position(vec4(position.xy, 0, 1.0));\n\n  vec4 fillColor = vec4(a_Color.rgb, a_Color.a * opacity);\n  v_color = mix(fillColor, vec4(u_stroke.xyz, u_stroke.w * fillColor.w * u_stroke_opacity), a_Normal.z);\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offsetCommon.xy, 0., 1.0));\n\n\n\n  setPickingColor(a_PickingColor);\n}\n";
+var flow_line_vert = "attribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec4 a_Instance;\nattribute vec3 a_Normal;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\n\n\n#pragma include \"projection\"\n#pragma include \"project\"\n#pragma include \"picking\"\nvarying vec4 v_color;\nuniform float u_gap_width: 1.0;\nuniform float u_stroke_width: 1.0;\nuniform float u_stroke_opacity: 1.0;\n\nvec2 project_pixel_offset(vec2 offsets) {\n\n   vec2 data = project_pixel(offsets);\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    return data;\n  }\n\n  return vec2(data.x, -data.y);;\n}\n\nvec2 line_dir(vec2 target, vec2 source) {\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     return normalize(target - source);\n  }\n  return normalize(ProjectFlat(target) - ProjectFlat(source));\n}\n\nfloat flag_gap() {\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     return 1.;\n  }\n  return -1.;\n\n}\n\n\nvoid main() {\n\n// \u900F\u660E\u5EA6\u8BA1\u7B97\n  vec2 source = a_Instance.rg;  // \u8D77\u59CB\u70B9\n  vec2 target =  a_Instance.ba; // \u7EC8\u70B9\n  vec2 flowlineDir = line_dir(target,source);\n  vec2 perpendicularDir = vec2(flowlineDir.y, flowlineDir.x); // mapbox || \u9AD8\u5FB7\n\n\n  vec2 position = mix(source, target, a_Position.x);\n  \n  float lengthCommon = length(project_position(vec4(target,0,1)) - project_position(vec4(source,0,1)));  //    \n  vec2 offsetDistances = a_Size.x * project_pixel_offset(vec2(a_Position.y, a_Position.z)); // Mapbox || \u9AD8\u5FB7\n  vec2 limitedOffsetDistances = clamp(   \n   offsetDistances,\n   project_pixel(-lengthCommon*.2), project_pixel(lengthCommon*.2)\n  );\n\n\n  float startOffsetCommon = project_pixel(offsets[0]);\n  float endOffsetCommon = project_pixel(offsets[1]);\n  float endpointOffset = mix(\n    clamp(startOffsetCommon, 0.0, lengthCommon*.2),\n    -clamp(endOffsetCommon, 0.0, lengthCommon*.2),\n    a_Position.x\n  );\n\n  vec2 normalsCommon =  u_stroke_width * project_pixel_offset(vec2(a_Normal.x, a_Normal.y)); // mapbox || \u9AD8\u5FB7\n\n  float gapCommon = flag_gap() * project_pixel(u_gap_width);\n  vec3 offsetCommon = vec3(\n    flowlineDir * (limitedOffsetDistances[1] + normalsCommon.y + endpointOffset * 1.05) -\n    perpendicularDir * (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),\n    0.0\n  );\n\n\n  vec4 project_pos = project_position(vec4(position.xy, 0, 1.0));\n\n  vec4 fillColor = vec4(a_Color.rgb, a_Color.a * opacity);\n  v_color = mix(fillColor, vec4(u_stroke.xyz, u_stroke.w * fillColor.w * u_stroke_opacity), a_Normal.z);\n\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offsetCommon.xy, 0., 1.0));\n\n\n\n  setPickingColor(a_PickingColor);\n}\n";
 var FlowLineModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(FlowLineModel, _BaseModel);
   var _super = _createSuper(FlowLineModel);
@@ -43,8 +43,6 @@ var FlowLineModel = /*#__PURE__*/function (_BaseModel) {
         _ref$strokeOpacity = _ref.strokeOpacity,
         strokeOpacity = _ref$strokeOpacity === void 0 ? 1 : _ref$strokeOpacity;
       return (0, _objectSpread2.default)({
-        // u_opacity: opacity,
-        // u_offsets: offsets,
         u_gap_width: gapWidth,
         u_stroke_width: strokeWidth,
         u_stroke: (0, _l7Utils.rgb2arr)(stroke),
@@ -84,7 +82,8 @@ var FlowLineModel = /*#__PURE__*/function (_BaseModel) {
                 vertexShader: flow_line_vert,
                 fragmentShader: flow_line_frag,
                 inject: this.getInject(),
-                triangulation: _triangulation.FlowLineFillTriangulation,
+                triangulation: _line_trangluation.FlowLineTriangulation,
+                styleOption: this.layer.getLayerConfig().symbol,
                 primitive: _l7Core.gl.TRIANGLES,
                 depth: {
                   enable: false

package/lib/line/models/line.js

@@ -103,14 +103,7 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
         _ref$linearDir = _ref.linearDir,
         linearDir = _ref$linearDir === void 0 ? _interface.LinearDir.VERTICAL : _ref$linearDir,
         _ref$blur = _ref.blur,
-        blur = _ref$blur === void 0 ? [1, 1, 1] : _ref$blur,
-        _ref$arrow = _ref.arrow,
-        arrow = _ref$arrow === void 0 ? {
-          enable: false,
-          arrowWidth: 2,
-          arrowHeight: 3,
-          tailWidth: 1
-        } : _ref$arrow;
+        blur = _ref$blur === void 0 ? [1, 1, 1] : _ref$blur;
       if (dashArray.length === 2) {
         dashArray.push(0, 0);
       }
@@ -151,12 +144,7 @@ var LineModel = /*#__PURE__*/function (_BaseModel) {
         u_heightfixed: Number(heightfixed),
         // 顶点高度 scale
         u_vertexScale: vertexHeightScale,
-        u_raisingHeight: Number(raisingHeight),
-        // arrow
-        u_arrow: Number(arrow.enable),
-        u_arrowHeight: arrow.arrowHeight || 3,
-        u_arrowWidth: arrow.arrowWidth || 2,
-        u_tailWidth: arrow.tailWidth === undefined ? 1 : arrow.tailWidth
+        u_raisingHeight: Number(raisingHeight)
       }, this.getStyleAttribute());
     }
   }, {

package/lib/line/shaders/dash/arc_dash_vert.glsl

@@ -13,9 +13,6 @@ uniform vec4 u_dash_array: [10.0, 5., 0, 0];
 uniform float u_lineDir: 1.0;
 varying vec4 v_dash_array;
 varying float v_distance_ratio;
-
-uniform float u_thetaOffset: 0.314;
-
 #pragma include "projection"
 #pragma include "project"
 #pragma include "picking"
@@ -92,8 +89,8 @@ void main() {
 
   v_distance_ratio = segmentIndex / segmentNumber;
 
-  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, u_thetaOffset), 0.0, 1.0));
-  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, u_thetaOffset), 0.0, 1.0));
+  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, thetaOffset), 0.0, 1.0));
+  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, thetaOffset), 0.0, 1.0));
  
   
   vec2 offset = project_pixel(getExtrusionOffset((next.xy - curr.xy) * indexDir, a_Position.y));

package/lib/line/shaders/flow/flow_line_vert.glsl

@@ -8,29 +8,59 @@ uniform mat4 u_ModelMatrix;
 
 
 #pragma include "projection"
+#pragma include "project"
 #pragma include "picking"
 varying vec4 v_color;
 uniform float u_gap_width: 1.0;
 uniform float u_stroke_width: 1.0;
 uniform float u_stroke_opacity: 1.0;
 
+vec2 project_pixel_offset(vec2 offsets) {
+
+   vec2 data = project_pixel(offsets);
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+    return data;
+  }
+
+  return vec2(data.x, -data.y);;
+}
+
+vec2 line_dir(vec2 target, vec2 source) {
+
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+     return normalize(target - source);
+  }
+  return normalize(ProjectFlat(target) - ProjectFlat(source));
+}
+
+float flag_gap() {
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+     return 1.;
+  }
+  return -1.;
+
+}
+
 
 void main() {
 
 // 透明度计算
   vec2 source = a_Instance.rg;  // 起始点
   vec2 target =  a_Instance.ba; // 终点
-  vec2 flowlineDir = normalize(target - source);
-  vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x);
+  vec2 flowlineDir = line_dir(target,source);
+  vec2 perpendicularDir = vec2(flowlineDir.y, flowlineDir.x); // mapbox || 高德
 
 
   vec2 position = mix(source, target, a_Position.x);
   
   float lengthCommon = length(project_position(vec4(target,0,1)) - project_position(vec4(source,0,1)));  //    
-  vec2 offsetDistances = a_Size.x * project_pixel(a_Position.yz);
+  vec2 offsetDistances = a_Size.x * project_pixel_offset(vec2(a_Position.y, a_Position.z)); // Mapbox || 高德
   vec2 limitedOffsetDistances = clamp(   
    offsetDistances,
-   project_pixel(-lengthCommon*.8), project_pixel(lengthCommon*.8)
+   project_pixel(-lengthCommon*.2), project_pixel(lengthCommon*.2)
   );
 
 
@@ -42,9 +72,9 @@ void main() {
     a_Position.x
   );
 
-  vec2 normalsCommon =  u_stroke_width * project_pixel(a_Normal.xy);
+  vec2 normalsCommon =  u_stroke_width * project_pixel_offset(vec2(a_Normal.x, a_Normal.y)); // mapbox || 高德
 
-  float gapCommon =  project_pixel(u_gap_width);
+  float gapCommon = flag_gap() * project_pixel(u_gap_width);
   vec3 offsetCommon = vec3(
     flowlineDir * (limitedOffsetDistances[1] + normalsCommon.y + endpointOffset * 1.05) -
     perpendicularDir * (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),

package/lib/line/shaders/linear/arc_linear_vert.glsl

@@ -11,7 +11,6 @@ varying float v_segmentIndex;
 
 uniform float u_lineDir: 1.0;
 
-uniform float u_thetaOffset: 0.314;
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
 
@@ -80,8 +79,8 @@ void main() {
   float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
   float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
   float d_distance_ratio;
-  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, u_thetaOffset), 0.0, 1.0));
-  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, u_thetaOffset), 0.0, 1.0));
+  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, thetaOffset), 0.0, 1.0));
+  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, thetaOffset), 0.0, 1.0));
   // v_normal = getNormal((next.xy - curr.xy) * indexDir, a_Position.y);
   //unProjCustomCoord
   

package/lib/plugins/DataMappingPlugin.js

@@ -147,11 +147,6 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
     key: "mapping",
     value: function mapping(layer, attributes, data, predata) {
       var _this3 = this;
-      var _ref5 = layer.getLayerConfig(),
-        _ref5$arrow = _ref5.arrow,
-        arrow = _ref5$arrow === void 0 ? {
-          enable: false
-        } : _ref5$arrow;
       var usedAttributes = attributes.filter(function (attribute) {
         return attribute.scale !== undefined;
       }).filter(function (attribute) {
@@ -179,18 +174,6 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
             encodeRecord.shape = _this3.fontService.getIconFontKey(encodeRecord[attribute.name]);
           }
         });
-        if (arrow.enable && encodeRecord.shape === 'line') {
-          // 只有在线图层且支持配置箭头的时候进行插入顶点的处理
-          var coords = encodeRecord.coordinates;
-          // @ts-ignore
-          if (layer.arrowInsertCount < layer.encodeDataLength) {
-            // Tip: arrowInsert 的判断用于确保每一条线数据 arrow 的属性点只会被植入一次
-            var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
-            encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);
-            // @ts-ignore
-            layer.arrowInsertCount++;
-          }
-        }
         return encodeRecord;
       });
       attributes.forEach(function (attribute) {
@@ -280,9 +263,9 @@ var DataMappingPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inver
       }
       var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       var params = [];
-      scalers.forEach(function (_ref6) {
+      scalers.forEach(function (_ref5) {
         var _attribute$scale2;
-        var field = _ref6.field;
+        var field = _ref5.field;
         if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
           // TODO:多字段，常量
           params.push(record[field]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.19.10",
+  "version": "2.19.11",
   "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.10",
-    "@antv/l7-maps": "2.19.10",
-    "@antv/l7-source": "2.19.10",
-    "@antv/l7-utils": "2.19.10",
+    "@antv/l7-core": "2.19.11",
+    "@antv/l7-maps": "2.19.11",
+    "@antv/l7-source": "2.19.11",
+    "@antv/l7-utils": "2.19.11",
     "@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.10",
+    "@antv/l7-test-utils": "2.19.11",
     "@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": "150d3dc74f975ad10d48868612b6f978e4bbce85",
+  "gitHead": "a16cafc9907fb3a118ee97df82832c88e114446d",
   "publishConfig": {
     "access": "public"
   }