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:betterGpxApproximation
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

2 Commits
master ... betterGpxA

Author SHA1 Message Date
Victor Shcherb
6de4d996da Revert changes and fix exception 2024-03-14 12:54:55 +02:00
Victor Shcherb
46edf48e3f Fix gpx approximation 2024-03-14 00:59:29 +02:00
1 changed files with 5 additions and 2 deletions
Show Stats Expand all files Collapse all files

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

@ -425,8 +425,8 @@ public class RoutePlannerFrontEnd {
while (st != end) {
LatLon point = r.getPoint(st);
boolean pointIsClosed = false;
int delta = 0, startInd = Math.max(0, start.ind - delta),
nextInd = Math.min(gpxPoints.size(), next.ind + delta);
int delta = 3, startInd = Math.max(0, start.ind - delta),
nextInd = Math.min(gpxPoints.size() - 1, next.ind + delta);
for (int k = startInd; !pointIsClosed && k < nextInd; k++) {
pointIsClosed = pointCloseEnough(minPointApproximation, point, gpxPoints.get(k),
gpxPoints.get(k + 1));
@ -773,11 +773,14 @@ public class RoutePlannerFrontEnd {
private boolean pointCloseEnough(float minPointApproximation, LatLon point, GpxPoint gpxPoint,
GpxPoint gpxPointNext) {
// LatLon gpxPointLL = gpxPoint.loc; // more correct version
// LatLon gpxPointNextLL = gpxPointNext.loc;
LatLon gpxPointLL = gpxPoint.pnt != null ? gpxPoint.pnt.getPreciseLatLon() : gpxPoint.loc;
LatLon gpxPointNextLL = gpxPointNext.pnt != null ? gpxPointNext.pnt.getPreciseLatLon() : gpxPointNext.loc;
double orthogonalDistance = MapUtils.getOrthogonalDistance(point.getLatitude(), point.getLongitude(),
gpxPointLL.getLatitude(), gpxPointLL.getLongitude(), gpxPointNextLL.getLatitude(),
gpxPointNextLL.getLongitude());
// System.out.printf("%.1f %s ( ntNext.ind, gpxPointLL, gpxPointNextLL);
return orthogonalDistance <= minPointApproximation;
}