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

Merge pull request #11075 from osmandapp/Tminor

Browse source 
Add minor stop 10281
This commit is contained in:
vshcherb 2021-03-06 13:34:28 +02:00 committed by GitHub
commit 1625a05a27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java
View file

@ -186,32 +186,22 @@ public class RouteResultPreparation {
public RouteSegmentResult filterMinorStops(RouteSegmentResult seg) { public RouteSegmentResult filterMinorStops(RouteSegmentResult seg) {
List<Integer> stops = null; List<Integer> stops = null;
int startPoint = seg.getStartPointIndex(); boolean plus = seg.getStartPointIndex() < seg.getEndPointIndex();
int endPoint = seg.getEndPointIndex(); int next;
int start;
int end;
if (startPoint < endPoint) { for (int i = seg.getStartPointIndex(); i != seg.getEndPointIndex(); i = next) {
start = startPoint; next = plus ? i + 1 : i - 1;
end = endPoint; int[] pointTypes = seg.getObject().getPointTypes(i);
} else {
start = endPoint;
end = startPoint;
}
while (start <= end) {
int[] pointTypes = seg.getObject().getPointTypes(start);
if (pointTypes != null) { if (pointTypes != null) {
for (int j = 0; j < pointTypes.length; j++) { for (int j = 0; j < pointTypes.length; j++) {
if (pointTypes[j] == seg.getObject().region.stopMinor) { if (pointTypes[j] == seg.getObject().region.stopMinor) {
if (stops == null) { if (stops == null) {
stops = new ArrayList<>(); stops = new ArrayList<>();
} }
stops.add(start); stops.add(i);
} }
} }
} }
start++;
} }
if (stops != null) { if (stops != null) {