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

Fix #5561. Requires testing

Browse source
This commit is contained in:
Victor Shcherb 2018-06-11 12:09:32 +02:00
parent f4c6538730
commit 2ab3abd502
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
OsmAnd/src/net/osmand/plus/GPXUtilities.java
View file

@ -1239,10 +1239,10 @@ public class GPXUtilities {
}
public static String asString(GPXFile file, OsmandApplication ctx) {
final Writer writer = new StringWriter();
GPXUtilities.writeGpx(writer, file, ctx);
return writer.toString();
}
final Writer writer = new StringWriter();
GPXUtilities.writeGpx(writer, file, ctx);
return writer.toString();
}
public static String writeGpxFile(File fout, GPXFile file, OsmandApplication ctx) {
Writer output = null;
@ -1251,10 +1251,10 @@ public class GPXUtilities {
fout.getParentFile().mkdirs();
}
output = new OutputStreamWriter(new FileOutputStream(fout), "UTF-8"); //$NON-NLS-1$
String msg = writeGpx(output, file, ctx);
if(Algorithms.isEmpty(file.path)) {
file.path = fout.getAbsolutePath();
}
String msg = writeGpx(output, file, ctx);
return msg;
} catch (IOException e) {
log.error("Error saving gpx", e); //$NON-NLS-1$
@ -1290,12 +1290,15 @@ public class GPXUtilities {
serializer.attribute(null, "xsi:schemaLocation",
"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd");
String trackName = getFilename(file.path);
serializer.startTag(null, "metadata");
writeNotNullText(serializer, "name", trackName);
if (file.metadata != null) {
serializer.startTag(null, "metadata");
writeNotNullText(serializer, "desc", file.metadata.desc);
writeExtensions(serializer, file.metadata);
serializer.endTag(null, "metadata");
}
serializer.endTag(null, "metadata");
for (Track track : file.tracks) {
if (!track.generalTrack) {
@ -1351,6 +1354,20 @@ public class GPXUtilities {
return null;
}
private static String getFilename(String path) {
if(path != null) {
int i = path.lastIndexOf('/');
if(i > 0) {
path = path.substring(i + 1);
}
i = path.lastIndexOf('.');
if(i > 0) {
path = path.substring(0, i);
}
}
return path;
}
private static void writeNotNullText(XmlSerializer serializer, String tag, String value) throws IOException {
if (value != null) {
serializer.startTag(null, tag);