2 files changed, 6 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/geopoint/DistanceParser.java b/main/src/cgeo/geocaching/geopoint/DistanceParser.java
index d8db8e4..e1692f4 100644
--- a/main/src/cgeo/geocaching/geopoint/DistanceParser.java
+++ b/main/src/cgeo/geocaching/geopoint/DistanceParser.java
@@ -1,9 +1,10 @@
 package cgeo.geocaching.geopoint;
 
+import cgeo.geocaching.utils.MatcherWrapper;
+
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Locale;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public final class DistanceParser {
@@ -22,7 +23,7 @@ public final class DistanceParser {
      *             if the given number is invalid
      */
     public static float parseDistance(String distanceText, final boolean metricUnit) {
-        final Matcher matcher = pattern.matcher(distanceText);
+        final MatcherWrapper matcher = new MatcherWrapper(pattern, distanceText);
 
         if (!matcher.find()) {
             throw new NumberFormatException(distanceText);
diff --git a/main/src/cgeo/geocaching/geopoint/GeopointParser.java b/main/src/cgeo/geocaching/geopoint/GeopointParser.java
index 7604b9d..97a9ec8 100644
--- a/main/src/cgeo/geocaching/geopoint/GeopointParser.java
+++ b/main/src/cgeo/geocaching/geopoint/GeopointParser.java
@@ -1,9 +1,10 @@
 package cgeo.geocaching.geopoint;
 
 
+import cgeo.geocaching.utils.MatcherWrapper;
+
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
@@ -105,7 +106,7 @@ class GeopointParser {
     {
 
         final Pattern pattern = LatLon.LAT == latlon ? patternLat : patternLon;
-        final Matcher matcher = pattern.matcher(text);
+        final MatcherWrapper matcher = new MatcherWrapper(pattern, text);
 
         if (matcher.find()) {
             final double sign = matcher.group(1).equalsIgnoreCase("S") || matcher.group(1).equalsIgnoreCase("W") ? -1.0 : 1.0;