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

Fix map location for split tracks in analyze screen

Browse source
This commit is contained in:
Vitaliy 2020-08-18 13:50:39 +03:00
parent e6235305c4
commit 1184d5183a
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java
View file

@ -147,7 +147,28 @@ public class TrackDetailsMenu {
if (points != null) { if (points != null) {
LatLon latLon = tb.getLatLonFromPixel(mx, my); LatLon latLon = tb.getLatLonFromPixel(mx, my);
gpxItem.locationOnMap = GPXLayer.createProjectionPoint(points.first, points.second, latLon); gpxItem.locationOnMap = GPXLayer.createProjectionPoint(points.first, points.second, latLon);
float pos = (float) (gpxItem.locationOnMap.distance / ((OrderedLineDataSet) ds.get(0)).getDivX());
float pos;
if (gpxItem.chartAxisType == GPXDataSetAxisType.TIME ||
gpxItem.chartAxisType == GPXDataSetAxisType.TIMEOFDAY) {
pos = gpxItem.locationOnMap.time / 1000f;
} else {
double totalDistance = 0;
int index = segment.points.indexOf(points.first);
if (index != -1) {
WptPt previousPoint = null;
for (int i = 0; i < index; i++) {
WptPt currentPoint = segment.points.get(i);
if (previousPoint != null) {
totalDistance += MapUtils.getDistance(previousPoint.lat, previousPoint.lon, currentPoint.lat, currentPoint.lon);
}
previousPoint = currentPoint;
}
totalDistance += MapUtils.getDistance(gpxItem.locationOnMap.lat, gpxItem.locationOnMap.lon, points.first.lat, points.first.lon);
}
pos = (float) (totalDistance / ((OrderedLineDataSet) ds.get(0)).getDivX());
}
float lowestVisibleX = chart.getLowestVisibleX(); float lowestVisibleX = chart.getLowestVisibleX();
float highestVisibleX = chart.getHighestVisibleX(); float highestVisibleX = chart.getHighestVisibleX();
float nextVisibleX = lowestVisibleX + (pos - gpxItem.chartHighlightPos); float nextVisibleX = lowestVisibleX + (pos - gpxItem.chartHighlightPos);