1 files changed, 4 insertions, 17 deletions
diff --git a/main/src/cgeo/geocaching/Waypoint.java b/main/src/cgeo/geocaching/Waypoint.java
index 7381aab..b2c5305 100644
--- a/main/src/cgeo/geocaching/Waypoint.java
+++ b/main/src/cgeo/geocaching/Waypoint.java
@@ -21,13 +21,13 @@ public class Waypoint implements IWaypoint {
 
     public static final String PREFIX_OWN = "OWN";
     private static final int ORDER_UNDEFINED = -2;
+    private static final Pattern PATTERN_COORDS = Pattern.compile("\\b[nNsS]\\s*\\d");
     private int id = -1;
     private String geocode = "geocode";
     private WaypointType waypointType = WaypointType.WAYPOINT;
     private String prefix = "";
     private String lookup = "";
     private String name = "";
-    private String latlon = "";
     private Geopoint coords = null;
     private String note = "";
     private int cachedOrder = ORDER_UNDEFINED;
@@ -67,9 +67,6 @@ public class Waypoint implements IWaypoint {
         if (StringUtils.isBlank(name)) {
             setName(old.name);
         }
-        if (StringUtils.isBlank(latlon) || latlon.startsWith("?")) { // there are waypoints containing "???"
-            latlon = old.latlon;
-        }
         if (coords == null) {
             coords = old.coords;
         }
@@ -204,14 +201,6 @@ public class Waypoint implements IWaypoint {
         this.name = name;
     }
 
-    public String getLatlon() {
-        return latlon;
-    }
-
-    public void setLatlon(final String latlon) {
-        this.latlon = latlon;
-    }
-
     @Override
     public Geopoint getCoords() {
         return coords;
@@ -303,10 +292,9 @@ public class Waypoint implements IWaypoint {
      */
     public static Collection<Waypoint> parseWaypointsFromNote(@NonNull final String initialNote) {
         final List<Waypoint> waypoints = new LinkedList<>();
-        final Pattern COORDPATTERN = Pattern.compile("\\b[nNsS]{1}\\s*\\d"); // begin of coordinates
 
         String note = initialNote;
-        MatcherWrapper matcher = new MatcherWrapper(COORDPATTERN, note);
+        MatcherWrapper matcher = new MatcherWrapper(PATTERN_COORDS, note);
         int count = 1;
         while (matcher.find()) {
             try {
@@ -321,12 +309,11 @@ public class Waypoint implements IWaypoint {
                     waypoints.add(waypoint);
                     count++;
                 }
-            } catch (final Geopoint.ParseException e) {
-                // ignore
+            } catch (final Geopoint.ParseException ignore) {
             }
 
             note = note.substring(matcher.start() + 1);
-            matcher = new MatcherWrapper(COORDPATTERN, note);
+            matcher = new MatcherWrapper(PATTERN_COORDS, note);
         }
         return waypoints;
     }