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

Add mutliple gpx

Browse source
This commit is contained in:
Victor Shcherb 2013-02-06 20:49:07 +01:00
parent e187a29933
commit 8529be7864
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
View file

@ -352,21 +352,23 @@ public class MapActivityLayers {
@Override @Override
public boolean processResult(GPXFile result) { public boolean processResult(GPXFile result) {
GPXFile toShow = result; GPXFile toShow = result;
if (toShow == null) { if (toShow == null || toShow.showCurrentTrack) {
if(!settings.SAVE_TRACK_TO_GPX.get()){ if(!settings.SAVE_TRACK_TO_GPX.get()){
AccessibleToast.makeText(activity, R.string.gpx_monitoring_disabled_warn, Toast.LENGTH_SHORT).show(); AccessibleToast.makeText(activity, R.string.gpx_monitoring_disabled_warn, Toast.LENGTH_SHORT).show();
return true;
} }
Map<String, GPXFile> data = activity.getSavingTrackHelper().collectRecordedData(); Map<String, GPXFile> data = activity.getSavingTrackHelper().collectRecordedData();
if(data.isEmpty()){ if(toShow == null) {
toShow = new GPXFile(); toShow = new GPXFile();
} else { toShow.showCurrentTrack = true;
toShow = data.values().iterator().next(); }
if(!data.isEmpty()) {
GPXFile last = data.values().iterator().next();
GPXUtilities.mergeGPXFileInto(toShow, last);
} }
} }
settings.SHOW_FAVORITES.set(true); settings.SHOW_FAVORITES.set(true);
getApplication().setGpxFileToDisplay(toShow, result == null); getApplication().setGpxFileToDisplay(toShow, toShow.showCurrentTrack);
WptPt loc = toShow.findPointToShow(); WptPt loc = toShow.findPointToShow();
if(loc != null){ if(loc != null){
mapView.getAnimatedDraggingThread().startMoving(loc.lat, loc.lon, mapView.getAnimatedDraggingThread().startMoving(loc.lat, loc.lon,
@ -405,17 +407,19 @@ public class MapActivityLayers {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.dismiss(); dialog.dismiss();
GPXFile currentGPX = null;
if (showCurrentGpx && selected[0]) { if (showCurrentGpx && selected[0]) {
callbackWithObject.processResult(null); currentGPX = new GPXFile();
} else { currentGPX.showCurrentTrack = true;
List<String> s = new ArrayList<String>();
for (int i = 0; i < selected.length; i++) {
if (selected[i]) {
s.add(list.get(i));
}
}
loadGPXFileInDifferentThread(callbackWithObject, convertCloudmade, dir, s.toArray(new String[s.size()]));
} }
List<String> s = new ArrayList<String>();
for (int i = (showCurrentGpx ? 1 : 0); i < selected.length; i++) {
if (selected[i]) {
s.add(list.get(i));
}
}
loadGPXFileInDifferentThread(callbackWithObject, convertCloudmade, dir, currentGPX,
s.toArray(new String[s.size()]));
} }
}); });
} else { } else {
@ -426,7 +430,7 @@ public class MapActivityLayers {
if (showCurrentGpx && which == 0) { if (showCurrentGpx && which == 0) {
callbackWithObject.processResult(null); callbackWithObject.processResult(null);
} else { } else {
loadGPXFileInDifferentThread(callbackWithObject, convertCloudmade, dir, list.get(which)); loadGPXFileInDifferentThread(callbackWithObject, convertCloudmade, dir, null, list.get(which));
} }
} }
}); });
@ -471,13 +475,13 @@ public class MapActivityLayers {
} }
private void loadGPXFileInDifferentThread(final CallbackWithObject<GPXFile> callbackWithObject, private void loadGPXFileInDifferentThread(final CallbackWithObject<GPXFile> callbackWithObject,
final boolean convertCloudmade, final File dir, final String... filename) { final boolean convertCloudmade, final File dir, final GPXFile currentFile, final String... filename) {
final ProgressDialog dlg = ProgressDialog.show(activity, getString(R.string.loading), final ProgressDialog dlg = ProgressDialog.show(activity, getString(R.string.loading),
getString(R.string.loading_data)); getString(R.string.loading_data));
new Thread(new Runnable() { new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
GPXFile r = null; GPXFile r = currentFile;
for(String fname : filename) { for(String fname : filename) {
final File f = new File(dir, fname); final File f = new File(dir, fname);
GPXFile res = GPXUtilities.loadGPXFile(activity.getMyApplication(), f, convertCloudmade); GPXFile res = GPXUtilities.loadGPXFile(activity.getMyApplication(), f, convertCloudmade);