gtfs-actions/generate-shapes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bug in line segment intersection

Browse source
This commit is contained in:
Patrick Brosi 2018-08-08 17:36:28 +02:00
parent f56294b597
commit 713262f756
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/util/geo/Geo.h
View file

@ -398,9 +398,9 @@ inline bool intersects(const LineSegment<T>& ls1, const LineSegment<T>& ls2) {
return intersects(getBoundingBox(ls1), getBoundingBox(ls2)) && return intersects(getBoundingBox(ls1), getBoundingBox(ls2)) &&
(contains(ls1.first, ls2) || contains(ls1.second, ls2) || (contains(ls1.first, ls2) || contains(ls1.second, ls2) ||
contains(ls2.first, ls1) || contains(ls2.second, ls1) || contains(ls2.first, ls1) || contains(ls2.second, ls1) ||
((crossProd(ls1.first, ls2) < 0) ^ (((crossProd(ls1.first, ls2) < 0) ^
(crossProd(ls1.second, ls2) < 0)) || (crossProd(ls1.second, ls2) < 0)) &&
((crossProd(ls2.first, ls1) < 0) ^ (crossProd(ls2.second, ls1) < 0))); ((crossProd(ls2.first, ls1) < 0) ^ (crossProd(ls2.second, ls1) < 0))));
} }
// _____________________________________________________________________________ // _____________________________________________________________________________
@ -953,7 +953,7 @@ inline Point<T> projectOn(const Point<T>& a, const Point<T>& b,
if (doubleEq(a.getX(), c.getX()) && doubleEq(a.getY(), c.getY())) return a; if (doubleEq(a.getX(), c.getX()) && doubleEq(a.getY(), c.getY())) return a;
if (doubleEq(b.getX(), c.getX()) && doubleEq(b.getY(), c.getY())) return b; if (doubleEq(b.getX(), c.getX()) && doubleEq(b.getY(), c.getY())) return b;
double x, y; T x, y;
if (c.getX() == a.getX()) { if (c.getX() == a.getX()) {
// infinite slope // infinite slope
@ -963,8 +963,8 @@ inline Point<T> projectOn(const Point<T>& a, const Point<T>& b,
double m = (double)(c.getY() - a.getY()) / (c.getX() - a.getX()); double m = (double)(c.getY() - a.getY()) / (c.getX() - a.getX());
double bb = (double)a.getY() - (m * a.getX()); double bb = (double)a.getY() - (m * a.getX());
x = (m * b.getY() + b.getX() - m * bb) / (m * m + 1); x = (m * b.getY() + b.getX() - m * bb) / (m * m + 1.0);
y = (m * m * b.getY() + m * b.getX() + bb) / (m * m + 1); y = (m * m * b.getY() + m * b.getX() + bb) / (m * m + 1.0);
} }
Point<T> ret = Point<T>(x, y); Point<T> ret = Point<T>(x, y);
@ -1017,7 +1017,7 @@ inline double parallelity(const Box<T>& box, const MultiLine<T>& multiline) {
ret += parallelity(box, l); ret += parallelity(box, l);
} }
return ret / multiline.size(); return ret / static_cast<float>(multiline.size());
} }
// _____________________________________________________________________________ // _____________________________________________________________________________

2
src/util/tests/TestMain.cpp
View file

@ -976,6 +976,8 @@ CASE("geometry") {
EXPECT(geo::intersects(lsb, lsb)); EXPECT(geo::intersects(lsb, lsb));
EXPECT(!geo::intersects(lsa, lsc)); EXPECT(!geo::intersects(lsa, lsc));
EXPECT(!geo::intersects(geo::Point<double>(871569.2, 6104550.4), geo::Point<double>(871581.2, 6104536), geo::Point<double>(871580.3, 6104541.3), geo::Point<double>(871625.7, 6104510.1)));
geo::Line<double> l{geo::Point<double>(1, 1), geo::Point<double>(2, 2), geo::Point<double>(2, 4)}; geo::Line<double> l{geo::Point<double>(1, 1), geo::Point<double>(2, 2), geo::Point<double>(2, 4)};
EXPECT(!geo::contains(geo::Point<double>(1, 2), l)); EXPECT(!geo::contains(geo::Point<double>(1, 2), l));
EXPECT(geo::contains(geo::Point<double>(2, 2), l)); EXPECT(geo::contains(geo::Point<double>(2, 2), l));