2 files changed, 43 insertions, 1 deletions

diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 9a8325d..96bb2fe 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -49,6 +49,7 @@ import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Pattern;
 
@@ -1360,6 +1361,9 @@ public class Geocache implements ICache, IWaypoint {
         return null;
     }
 
+    /**
+     * Detect coordinates in the personal note and convert them to user defined waypoints. Works by rule of thumb.
+     */
     public void parseWaypointsFromNote() {
         try {
             if (StringUtils.isBlank(getPersonalNote())) {
@@ -1375,7 +1379,8 @@ public class Geocache implements ICache, IWaypoint {
                     // coords must have non zero latitude and longitude and at least one part shall have fractional degrees
                     if (point.getLatitudeE6() != 0 && point.getLongitudeE6() != 0 && ((point.getLatitudeE6() % 1000) != 0 || (point.getLongitudeE6() % 1000) != 0)) {
                         final String name = cgeoapplication.getInstance().getString(R.string.cache_personal_note) + " " + count;
-                        final Waypoint waypoint = new Waypoint(name, WaypointType.WAYPOINT, false);
+                        final String potentialWaypointType = note.substring(Math.max(0, matcher.start() - 15));
+                        final Waypoint waypoint = new Waypoint(name, parseWaypointType(potentialWaypointType), false);
                         waypoint.setCoords(point);
                         addOrChangeWaypoint(waypoint, false);
                         count++;
@@ -1392,6 +1397,25 @@ public class Geocache implements ICache, IWaypoint {
         }
     }
 
+    /**
+     * Detect waypoint types in the personal note text. It works by rule of thumb only.
+     */
+    private static WaypointType parseWaypointType(final String input) {
+        final String lowerInput = StringUtils.substring(input, 0, 20).toLowerCase(Locale.getDefault());
+        for (WaypointType wpType : WaypointType.values()) {
+            if (lowerInput.contains(wpType.getL10n().toLowerCase(Locale.getDefault()))) {
+                return wpType;
+            }
+            if (lowerInput.contains(wpType.id)) {
+                return wpType;
+            }
+            if (lowerInput.contains(wpType.name().toLowerCase(Locale.US))) {
+                return wpType;
+            }
+        }
+        return WaypointType.WAYPOINT;
+    }
+
     /*
      * For working in the debugger
      * (non-Javadoc)
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
index cf1df46..ff7ddff 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
@@ -7,6 +7,7 @@ import cgeo.geocaching.Settings;
 import cgeo.geocaching.Waypoint;
 import cgeo.geocaching.enumerations.LoadFlags;
 import cgeo.geocaching.enumerations.StatusCode;
+import cgeo.geocaching.enumerations.WaypointType;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
 import cgeo.geocaching.test.R;
@@ -22,6 +23,7 @@ import android.os.Handler;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class GCParserTest extends AbstractResourceInstrumentationTestCase {
 
@@ -187,6 +189,22 @@ public class GCParserTest extends AbstractResourceInstrumentationTestCase {
         assertEquals(13, cache.getWaypoints().size());
     }
 
+    public static void testNoteParsingWaypointTypes() {
+        final Geocache cache = new Geocache();
+        cache.setWaypoints(new ArrayList<Waypoint>(), false);
+        cache.setPersonalNote("\"Parking area at PARKING=N 50° 40.666E 006° 58.222\n" +
+                "My calculated final coordinates: FINAL=N 50° 40.777E 006° 58.111\n" +
+                "Get some ice cream at N 50° 40.555E 006° 58.000\"");
+
+        cache.parseWaypointsFromNote();
+        final List<Waypoint> waypoints = cache.getWaypoints();
+
+        assertEquals(3, waypoints.size());
+        assertEquals(WaypointType.PARKING, waypoints.get(0).getWaypointType());
+        assertEquals(WaypointType.FINAL, waypoints.get(1).getWaypointType());
+        assertEquals(WaypointType.WAYPOINT, waypoints.get(2).getWaypointType());
+    }
+
     private Geocache parseCache(int resourceId) {
         final String page = getFileContent(resourceId);
         final SearchResult result = GCParser.parseCacheFromText(page, null);