Fabio/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #133 from Phyks/nogoPolyline

Browse source 
Fix nogo weights with polylines
This commit is contained in:
abrensch 2018-12-13 18:15:56 +01:00 committed by GitHub
commit 02d053f189
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
brouter-core/src/main/java/btools/router/OsmNogoPolygon.java
View file

@ -330,9 +330,11 @@ public class OsmNogoPolygon extends OsmNodeNamed
Point edgePoint1 = points.get(j); Point edgePoint1 = points.get(j);
Point edgePoint2 = points.get(i); Point edgePoint2 = points.get(i);
int intersectsEdge = intersect2D_2Segments(p1, p2, edgePoint1, edgePoint2); int intersectsEdge = intersect2D_2Segments(p1, p2, edgePoint1, edgePoint2);
if (intersectsEdge == 1)
if (isClosed && intersectsEdge == 1)
{ {
// Intersects in a single point // Intersects with a (closed) polygon edge on a single point
// Distance is zero when crossing a polyline.
// Let's find this intersection point // Let's find this intersection point
int xdiffSegment = lon1 - lon2; int xdiffSegment = lon1 - lon2;
int xdiffEdge = edgePoint1.x - edgePoint2.x; int xdiffEdge = edgePoint1.x - edgePoint2.x;
@ -364,7 +366,19 @@ public class OsmNogoPolygon extends OsmNodeNamed
} }
else if (intersectsEdge == 2) { else if (intersectsEdge == 2) {
// Segment and edge overlaps // Segment and edge overlaps
distance += CheapRulerSingleton.distance(lon1, lat1, lon2, lat2); // FIXME: Could probably be done in a smarter way
distance += Math.min(
CheapRulerSingleton.distance(p1.x, p1.y, p2.x, p2.y),
Math.min(
CheapRulerSingleton.distance(edgePoint1.x, edgePoint1.y, edgePoint2.x, edgePoint2.y),
Math.min(
CheapRulerSingleton.distance(p1.x, p1.y, edgePoint2.x, edgePoint2.y),
CheapRulerSingleton.distance(edgePoint1.x, edgePoint1.y, p2.x, p2.y)
)
)
);
// FIXME: We could store intersection.
previousIntersectionOnSegment = null;
} }
} }

30
brouter-core/src/test/java/btools/router/OsmNogoPolygonTest.java
View file

@ -148,12 +148,16 @@ public class OsmNogoPolygonTest {
@Test @Test
public void testDistanceWithinPolygon() { public void testDistanceWithinPolygon() {
// Testing polygon // Testing polygon
final double[] lons = { 2.333523, 2.333432, 2.333833, 2.333983, 2.334815, 2.334766, 2.333523 }; final double[] lons = { 2.333523, 2.333432, 2.333833, 2.333983, 2.334815, 2.334766 };
final double[] lats = { 48.823778, 48.824091, 48.82389, 48.824165, 48.824232, 48.82384, 48.823778 }; final double[] lats = { 48.823778, 48.824091, 48.82389, 48.824165, 48.824232, 48.82384 };
OsmNogoPolygon polygon = new OsmNogoPolygon(true); OsmNogoPolygon polygon = new OsmNogoPolygon(true);
for (int i = 0; i < lons.length; i++) { for (int i = 0; i < lons.length; i++) {
polygon.addVertex(toOsmLon(lons[i], 0), toOsmLat(lats[i], 0)); polygon.addVertex(toOsmLon(lons[i], 0), toOsmLat(lats[i], 0));
} }
OsmNogoPolygon polyline = new OsmNogoPolygon(false);
for (int i = 0; i < lons.length; i++) {
polyline.addVertex(toOsmLon(lons[i], 0), toOsmLat(lats[i], 0));
}
// Check with a segment with a single intersection with the polygon // Check with a segment with a single intersection with the polygon
int lon1 = toOsmLon(2.33308732509613, 0); int lon1 = toOsmLon(2.33308732509613, 0);
@ -196,5 +200,27 @@ public class OsmNogoPolygonTest {
polygon.distanceWithinPolygon(lon1, lat1, lon2, lat2), polygon.distanceWithinPolygon(lon1, lat1, lon2, lat2),
0.05 * 35 0.05 * 35
); );
lon1 = toOsmLon(2.333523, 0);
lat1 = toOsmLat(48.823778, 0);
lon2 = toOsmLon(2.333432, 0);
lat2 = toOsmLat(48.824091, 0);
assertEquals(
"Should give the correct length if the segment overlaps with an edge of the polygon",
CheapRulerSingleton.distance(lon1, lat1, lon2, lat2),
polygon.distanceWithinPolygon(lon1, lat1, lon2, lat2),
0.05 * CheapRulerSingleton.distance(lon1, lat1, lon2, lat2)
);
lon1 = toOsmLon(2.333523, 0);
lat1 = toOsmLat(48.823778, 0);
lon2 = toOsmLon(2.3334775, 0);
lat2 = toOsmLat(48.8239345, 0);
assertEquals(
"Should give the correct length if the segment overlaps with a polyline",
CheapRulerSingleton.distance(lon1, lat1, lon2, lat2),
polyline.distanceWithinPolygon(lon1, lat1, lon2, lat2),
0.05 * CheapRulerSingleton.distance(lon1, lat1, lon2, lat2)
);
} }
} }