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

Fix #4328

Browse source
This commit is contained in:
PavelRatushnyi 2017-09-30 09:53:31 +03:00
parent fb38f4cde1
commit fe8a2fa9b4
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
OsmAnd/src/net/osmand/plus/views/GPXLayer.java
View file

@ -465,29 +465,39 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
private void drawSelectedFilesSegments(Canvas canvas, RotatedTileBox tileBox, private void drawSelectedFilesSegments(Canvas canvas, RotatedTileBox tileBox,
List<SelectedGpxFile> selectedGPXFiles, DrawSettings settings) { List<SelectedGpxFile> selectedGPXFiles, DrawSettings settings) {
SelectedGpxFile currentTrack = null;
for (SelectedGpxFile g : selectedGPXFiles) { for (SelectedGpxFile g : selectedGPXFiles) {
GpxDataItem gpxDataItem = null; if (g.isShowCurrentTrack()) {
if (!g.isShowCurrentTrack()) { currentTrack = g;
gpxDataItem = view.getApplication().getGpxDatabase().getItem(new File(g.getGpxFile().path)); } else {
} List<TrkSegment> segments = g.getPointsToDisplay();
List<TrkSegment> segments = g.getPointsToDisplay(); for (TrkSegment ts : segments) {
for (TrkSegment ts : segments) { GpxDataItem gpxDataItem = view.getApplication().getGpxDatabase().getItem(new File(g.getGpxFile().path));
int color = gpxDataItem != null ? gpxDataItem.getColor() : 0; int color = gpxDataItem != null ? gpxDataItem.getColor() : 0;
if (g.isShowCurrentTrack()) { if (color == 0) {
color = currentTrackColor; color = ts.getColor(cachedColor);
}
if (ts.renders.isEmpty() // only do once (CODE HERE NEEDS TO BE UI INSTEAD)
&& !ts.points.isEmpty()) { // hmmm. 0-point tracks happen, but.... how?
ts.renders.add(new Renderable.StandardTrack(ts.points, 17.2));
}
updatePaints(color, g.isRoutePoints(), false, settings, tileBox);
ts.drawRenderers(view.getZoom(), paint, canvas, tileBox);
} }
}
}
if (currentTrack != null) {
List<TrkSegment> segments = currentTrack.getPointsToDisplay();
for (TrkSegment ts : segments) {
int color = currentTrackColor;
if (color == 0) { if (color == 0) {
color = ts.getColor(cachedColor); color = ts.getColor(cachedColor);
} }
if (ts.renders.isEmpty() // only do once (CODE HERE NEEDS TO BE UI INSTEAD) if (ts.renders.isEmpty() // only do once (CODE HERE NEEDS TO BE UI INSTEAD)
&& !ts.points.isEmpty()) { // hmmm. 0-point tracks happen, but.... how? && !ts.points.isEmpty()) { // hmmm. 0-point tracks happen, but.... how?
if (g.isShowCurrentTrack()) { ts.renders.add(new Renderable.CurrentTrack(ts.points));
ts.renders.add(new Renderable.CurrentTrack(ts.points));
} else {
ts.renders.add(new Renderable.StandardTrack(ts.points, 17.2));
}
} }
updatePaints(color, g.isRoutePoints(), g.isShowCurrentTrack(), settings, tileBox); updatePaints(color, currentTrack.isRoutePoints(), true, settings, tileBox);
ts.drawRenderers(view.getZoom(), paint, canvas, tileBox); ts.drawRenderers(view.getZoom(), paint, canvas, tileBox);
} }
} }