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

Add check for general track

Browse source 
(cherry picked from commit 10c4e06aa1)
This commit is contained in:
Vitaliy 2020-02-25 12:07:01 +02:00
parent 2eb9b7d143
commit 318ffc541f
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
View file

@ -35,6 +35,7 @@ import org.json.JSONObject;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -599,6 +600,9 @@ public class GpxSelectionHelper {
if (dataItem.getColor() != 0) { if (dataItem.getColor() != 0) {
gpx.setColor(dataItem.getColor()); gpx.setColor(dataItem.getColor());
} }
if (gpx.getGeneralTrack() == null) {
app.getGpxDbHelper().updateJoinSegments(dataItem, false);
}
sf.setJoinSegments(dataItem.isJoinSegments()); sf.setJoinSegments(dataItem.isJoinSegments());
} }
sf.setGpxFile(gpx, app); sf.setGpxFile(gpx, app);
@ -728,8 +732,12 @@ public class GpxSelectionHelper {
} }
public List<TrkSegment> getPointsToDisplay() { public List<TrkSegment> getPointsToDisplay() {
if (joinSegments && gpxFile != null && gpxFile.getGeneralTrack() != null) { if (joinSegments) {
return gpxFile.getGeneralTrack().segments; if (gpxFile != null && gpxFile.getGeneralTrack() != null) {
return gpxFile.getGeneralTrack().segments;
} else {
return Collections.emptyList();
}
} }
return processedPointsToDisplay; return processedPointsToDisplay;
} }