_boundSegments did not work on rising line (#8838)

diff --git a/src/helpers/helpers.segment.js b/src/helpers/helpers.segment.js
index 9a3ce5ec84b988fd6b860d1a4454f04505443a0b..b68582312489bb1c2d128347141042bb6663f9c6 100644 (file)
--- a/src/helpers/helpers.segment.js
+++ b/src/helpers/helpers.segment.js
@@ -14,7 +14,7 @@ function propertyFn(property) {
     };
   }
   return {
-    between: (n, s, e) => n >= s && n <= e,
+    between: (n, s, e) => n >= Math.min(s, e) && n <= Math.max(e, s),
     compare: (a, b) => a - b,
     normalize: x => x
   };

diff --git a/test/specs/helpers.segment.tests.js b/test/specs/helpers.segment.tests.js
index c0ac630260324072037a4e14ada288cff1293ec6..eca3c3fab7f332332c4a80424602fc393f7eaa74 100644 (file)
--- a/test/specs/helpers.segment.tests.js
+++ b/test/specs/helpers.segment.tests.js
@@ -40,5 +40,14 @@ describe('helpers.segments', function() {
     it('should find segment from after the line', function() {
       expect(_boundSegment(segment, points, {property: 'x', start: 25, end: 35})).toEqual([{start: 1, end: 2, loop: false}]);
     });
+
+    it('should find multiple segments', function() {
+      const points2 = [{x: 0, y: 100}, {x: 1, y: 50}, {x: 2, y: 70}, {x: 4, y: 80}, {x: 5, y: -100}];
+      expect(_boundSegment({start: 0, end: 4, loop: false}, points2, {property: 'y', start: 60, end: 60})).toEqual([
+        {start: 0, end: 1, loop: false},
+        {start: 1, end: 2, loop: false},
+        {start: 3, end: 4, loop: false},
+      ]);
+    });
   });
 });