aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorBananeweizen <Bananeweizen@gmx.de>2013-03-29 18:06:15 +0100
committerBananeweizen <Bananeweizen@gmx.de>2013-03-29 18:06:15 +0100
commita0718b07505ccb4e484d0deddc901cb842f4679d (patch)
treed8bf05502996f6c197629ede256c26bf4080aac9 /main
parent2c25692617d402ad6aef7bc4f13fe38997f4c5c3 (diff)
downloadcgeo-a0718b07505ccb4e484d0deddc901cb842f4679d.zip
cgeo-a0718b07505ccb4e484d0deddc901cb842f4679d.tar.gz
cgeo-a0718b07505ccb4e484d0deddc901cb842f4679d.tar.bz2
fix #2489: remove wrong error log entry on gpx export
Diffstat (limited to 'main')
-rw-r--r--main/src/cgeo/geocaching/export/GpxExport.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index c4060fe..28ca646 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -250,12 +250,14 @@ class GpxExport extends AbstractExport {
for (Waypoint wp : originWaypoints) {
String prefix = wp.getPrefix();
try {
- maxPrefix = Math.max(Integer.parseInt(prefix), maxPrefix);
+ final int numericPrefix = Integer.parseInt(prefix);
+ maxPrefix = Math.max(numericPrefix, maxPrefix);
} catch (NumberFormatException ex) {
- Log.e("Unexpected origin waypoint prefix='" + prefix + "'", ex);
+ // ignore non numeric prefix, as it should be unique in the list of non-own waypoints already
}
writeCacheWaypoint(gpx, wp, prefix);
}
+ // Prefixes must be unique. There use numeric strings as prefixes in OWN waypoints
for (Waypoint wp : ownWaypoints) {
maxPrefix++;
String prefix = StringUtils.leftPad(String.valueOf(maxPrefix), 2, '0');