Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add conditions for restrictions via ways

Browse source
This commit is contained in:
Kseniia 2021-01-07 12:15:51 +02:00
parent 0361b6b773
commit 2c802717a9
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java
View file

@ -29,7 +29,7 @@ public class BinaryRoutePlanner {
protected static final Log log = PlatformUtil.getLog(BinaryRoutePlanner.class); protected static final Log log = PlatformUtil.getLog(BinaryRoutePlanner.class);
private static final int ROUTE_POINTS = 11; private static final int ROUTE_POINTS = 11;
private static final boolean TRACE_ROUTING = true; private static final boolean TRACE_ROUTING = false;
public static double squareRootDist(int x1, int y1, int x2, int y2) { public static double squareRootDist(int x1, int y1, int x2, int y2) {
@ -678,8 +678,7 @@ public class BinaryRoutePlanner {
} }
// Check if there is restriction only to the other than current road // Check if there is restriction only to the other than current road
if (rt == MapRenderingTypes.RESTRICTION_ONLY_RIGHT_TURN if (rt == MapRenderingTypes.RESTRICTION_ONLY_RIGHT_TURN || rt == MapRenderingTypes.RESTRICTION_ONLY_LEFT_TURN
|| rt == MapRenderingTypes.RESTRICTION_ONLY_LEFT_TURN
|| rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) { || rt == MapRenderingTypes.RESTRICTION_ONLY_STRAIGHT_ON) {
// check if that restriction applies to considered junk // check if that restriction applies to considered junk
RouteSegment foundNext = inputNext; RouteSegment foundNext = inputNext;
@ -687,8 +686,6 @@ public class BinaryRoutePlanner {
if (foundNext.getRoad().id == restrictedTo) { if (foundNext.getRoad().id == restrictedTo) {
break; break;
} }
foundNext = foundNext.next; foundNext = foundNext.next;
} }
if (foundNext != null) { if (foundNext != null) {
@ -697,7 +694,7 @@ public class BinaryRoutePlanner {
} }
} }
} }
if (type == REVERSE_WAY_RESTRICTION_ONLY) { if (type == REVERSE_WAY_RESTRICTION_ONLY) {
// next = next.next; continue; // next = next.next; continue;
} else if (type == -1 && exclusiveRestriction) { } else if (type == -1 && exclusiveRestriction) {
// next = next.next; continue; // next = next.next; continue;