git/OsmAnd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: git:master
Branches Tags
git:master
git:AddMissedQuickActions
git:ktGradleShared
git:Fix_20211
git:rzr-obf-gpx
git:r4.8
git:rzr-ss-acceptedTypes-string
git:issue_2393
git:2597-testTriangleRule
git:GpxActivity
git:victor-4.9-gpx
git:victor-4.8-gpx
git:rzr-4.8-gpx
git:test_dex2
git:update_versions
git:r4.7
git:rzr-marine
git:implemente_kotlin_library
git:fixRescuetrack
git:betterGpxApproximation
git:oRefactorRoutingCode
git:r4.6
git:aa_search
git:test_recalculate
git:Fix_map_yawing
git:Test_tilt_n_rotate_as_3D_gestures
git:smartfolders_refactoring
git:auto_zoom_draft
git:stylesAndColors
git:fix_12303_wikimedia_category
git:r4.5
git:r4.4
git:fix-16379
git:r4.3
git:wearable_test
git:fix_15559_turn_indication
git:r4.2
git:routeAlternatives
git:r4.1
git:r4.0
git:r3.9
git:r3.8
git:r3.7
git:r3.6
git:r3.5
git:r3.4
git:r3.3
git:r3.2
git:r3.1
git:r3.0
git:r2.9
git:r2.7
git:r2.6
git:r2.5
git:r2.4
git:r2.3
git:r2.2
git:r2.1
git:r2.0
git:r1.9
git:r1.8
git:r1.7
git:r1.6
git:r1.5
git:2.0.0
...
pull from: git:fixRescuetrack
Branches Tags
git:AddMissedQuickActions
git:master
git:ktGradleShared
git:Fix_20211
git:rzr-obf-gpx
git:r4.8
git:rzr-ss-acceptedTypes-string
git:issue_2393
git:2597-testTriangleRule
git:GpxActivity
git:victor-4.9-gpx
git:victor-4.8-gpx
git:rzr-4.8-gpx
git:test_dex2
git:update_versions
git:r4.7
git:rzr-marine
git:implemente_kotlin_library
git:fixRescuetrack
git:betterGpxApproximation
git:oRefactorRoutingCode
git:r4.6
git:aa_search
git:test_recalculate
git:Fix_map_yawing
git:Test_tilt_n_rotate_as_3D_gestures
git:smartfolders_refactoring
git:auto_zoom_draft
git:stylesAndColors
git:fix_12303_wikimedia_category
git:r4.5
git:r4.4
git:fix-16379
git:r4.3
git:wearable_test
git:fix_15559_turn_indication
git:r4.2
git:routeAlternatives
git:r4.1
git:r4.0
git:r3.9
git:r3.8
git:r3.7
git:r3.6
git:r3.5
git:r3.4
git:r3.3
git:r3.2
git:r3.1
git:r3.0
git:r2.9
git:r2.7
git:r2.6
git:r2.5
git:r2.4
git:r2.3
git:r2.2
git:r2.1
git:r2.0
git:r1.9
git:r1.8
git:r1.7
git:r1.6
git:r1.5
git:2.0.0

1 Commits
master ... fixRescuet

Author SHA1 Message Date
Victor Shcherb
2ef5de614e Fix unnecessary u-turn, fix mysterious go ahead - cause by created virtual segments make precise calls in between 2024-03-15 00:35:34 +02:00
2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
View File

@ -493,7 +493,7 @@ public class RoutePlannerFrontEnd {
for (int i = 0; i < gpxPoints.size() && !gctx.ctx.calculationProgress.isCancelled; ) {
GpxPoint pnt = gpxPoints.get(i);
if (pnt.routeToTarget != null && !pnt.routeToTarget.isEmpty()) {
makeSegmentPointPrecise(pnt.getFirstRouteRes(), pnt.loc, true);
// makeSegmentPointPrecise(pnt.getFirstRouteRes(), pnt.loc, true);
LatLon startPoint = pnt.getFirstRouteRes().getStartPoint();
if (lastStraightLine != null) {
lastStraightLine.add(startPoint);
@ -509,7 +509,7 @@ public class RoutePlannerFrontEnd {
gctx.finalPoints.add(pnt);
gctx.result.addAll(pnt.routeToTarget);
i = pnt.targetInd;
makeSegmentPointPrecise(pnt.getLastRouteRes(), gpxPoints.get(i).loc, false);
// makeSegmentPointPrecise(pnt.getLastRouteRes(), gpxPoints.get(i).loc, false);
} else {
// add straight line from i -> i+1
LatLon lastPoint = null;

2
OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java
View File

@ -43,7 +43,7 @@ import net.osmand.util.MapUtils;
public class RouteResultPreparation {
public static boolean PRINT_TO_CONSOLE_ROUTE_INFORMATION = true;
public static boolean PRINT_TO_CONSOLE_ROUTE_INFORMATION_TO_TEST = false;
public static boolean PRINT_TO_CONSOLE_ROUTE_INFORMATION_TO_TEST = true;
public static String PRINT_TO_GPX_FILE = null;
private static final float TURN_DEGREE_MIN = 45;
private static final float UNMATCHED_TURN_DEGREE_MINIMUM = 45;