fix #1833: Export / Import GPX

2 files changed, 12 insertions, 6 deletions

diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index 0f73e29..9bc3963 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -335,10 +335,12 @@ class GpxExport extends AbstractExport {
             gpx.write(StringEscapeUtils.escapeXml(wp.getGeocode().substring(2)));
             gpx.write("</name>");
 
-            gpx.write("<cmt />");
+            gpx.write("<cmt>");
+            gpx.write(StringEscapeUtils.escapeXml(wp.getNote()));
+            gpx.write("</cmt>");
 
             gpx.write("<desc>");
-            gpx.write(StringEscapeUtils.escapeXml(wp.getNote()));
+            gpx.write(StringEscapeUtils.escapeXml(wp.getName()));
             gpx.write("</desc>");
 
             gpx.write("<sym>");
diff --git a/main/src/cgeo/geocaching/files/GPXParser.java b/main/src/cgeo/geocaching/files/GPXParser.java
index f8ec61c..454c494 100644
--- a/main/src/cgeo/geocaching/files/GPXParser.java
+++ b/main/src/cgeo/geocaching/files/GPXParser.java
@@ -255,8 +255,13 @@ public abstract class GPXParser extends FileParser {
             public void start(Attributes attrs) {
                 try {
                     if (attrs.getIndex("lat") > -1 && attrs.getIndex("lon") > -1) {
-                        cache.setCoords(new Geopoint(Double.valueOf(attrs.getValue("lat")),
-                                Double.valueOf(attrs.getValue("lon"))));
+                        final String latitude = attrs.getValue("lat");
+                        final String longitude = attrs.getValue("lon");
+                        // latitude and longitude are required attributes, but we export them empty for waypoints without coordinates
+                        if (StringUtils.isNotBlank(latitude) && StringUtils.isNotBlank(longitude)) {
+                            cache.setCoords(new Geopoint(Double.valueOf(latitude),
+                                    Double.valueOf(longitude)));
+                        }
                     }
                 } catch (Exception e) {
                     Log.w("Failed to parse waypoint's latitude and/or longitude.");
@@ -300,8 +305,7 @@ public abstract class GPXParser extends FileParser {
                     result.put(key, cache);
                     showProgressMessage(progressHandler, progressStream.getProgress());
                 } else if (StringUtils.isNotBlank(cache.getName())
-                        && cache.getCoords() != null
-                        && StringUtils.contains(type, "waypoint")) {
+                        && StringUtils.containsIgnoreCase(type, "waypoint")) {
                     addWaypointToCache();
                 }