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

Add new tags to the GPXFile

Browse source
This commit is contained in:
Alex Sytnyk 2018-06-05 20:33:07 +03:00
parent d4065587c0
commit a05ff9c556
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -268,6 +268,10 @@ public class GPXUtilities {
} }
public static class Metadata extends GPXExtensions {
public String desc;
}
public static class GPXTrackAnalysis { public static class GPXTrackAnalysis {
public float totalDistance = 0; public float totalDistance = 0;
public int totalTracks = 0; public int totalTracks = 0;
@ -779,6 +783,7 @@ public class GPXUtilities {
public static class GPXFile extends GPXExtensions { public static class GPXFile extends GPXExtensions {
public String author; public String author;
public Metadata metadata;
public List<Track> tracks = new ArrayList<>(); public List<Track> tracks = new ArrayList<>();
private List<WptPt> points = new ArrayList<>(); private List<WptPt> points = new ArrayList<>();
public List<Route> routes = new ArrayList<>(); public List<Route> routes = new ArrayList<>();
@ -1274,6 +1279,13 @@ public class GPXUtilities {
serializer.attribute(null, "xsi:schemaLocation", serializer.attribute(null, "xsi:schemaLocation",
"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd"); "http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd");
if (file.metadata != null) {
serializer.startTag(null, "metadata");
writeNotNullText(serializer, "desc", file.metadata.desc);
writeExtensions(serializer, file.metadata);
serializer.endTag(null, "metadata");
}
for (Track track : file.tracks) { for (Track track : file.tracks) {
if (!track.generalTrack) { if (!track.generalTrack) {
serializer.startTag(null, "trk"); //$NON-NLS-1$ serializer.startTag(null, "trk"); //$NON-NLS-1$
@ -1478,6 +1490,11 @@ public class GPXUtilities {
if (parser.getName().equals("gpx")) { if (parser.getName().equals("gpx")) {
((GPXFile) parse).author = parser.getAttributeValue("", "creator"); ((GPXFile) parse).author = parser.getAttributeValue("", "creator");
} }
if (parser.getName().equals("metadata")) {
Metadata metadata = new Metadata();
((GPXFile) parse).metadata = metadata;
parserState.push(metadata);
}
if (parser.getName().equals("trk")) { if (parser.getName().equals("trk")) {
Track track = new Track(); Track track = new Track();
((GPXFile) parse).tracks.add(track); ((GPXFile) parse).tracks.add(track);
@ -1493,6 +1510,10 @@ public class GPXUtilities {
((GPXFile) parse).points.add(wptPt); ((GPXFile) parse).points.add(wptPt);
parserState.push(wptPt); parserState.push(wptPt);
} }
} else if (parse instanceof Metadata) {
if (parser.getName().equals("desc")) {
((Metadata) parse).desc = readText(parser, "desc");
}
} else if (parse instanceof Route) { } else if (parse instanceof Route) {
if (parser.getName().equals("name")) { if (parser.getName().equals("name")) {
((Route) parse).name = readText(parser, "name"); ((Route) parse).name = readText(parser, "name");
@ -1606,7 +1627,10 @@ public class GPXUtilities {
extensionReadMode = false; extensionReadMode = false;
} }
if (tag.equals("trkpt")) { if (tag.equals("metadata")) {
Object pop = parserState.pop();
assert pop instanceof Metadata;
} else if (tag.equals("trkpt")) {
Object pop = parserState.pop(); Object pop = parserState.pop();
assert pop instanceof WptPt; assert pop instanceof WptPt;
} else if (tag.equals("wpt")) { } else if (tag.equals("wpt")) {