package cgeo.geocaching.geopoint;

import cgeo.geocaching.cgBase;
import cgeo.geocaching.cgSettings;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

public final class DistanceParser {

    private static final Pattern pattern = Pattern.compile("^([0-9\\.\\,]+)[ ]*(m|km|ft|yd|mi|)?$", Pattern.CASE_INSENSITIVE);

    /**
     * Parse a distance string composed by a number and an optional suffix
     * (such as "1.2km").
     *
     * @param distanceText
     *            the string to analyze
     * @return the distance in kilometers
     *
     * @throws NumberFormatException
     *             if the given number is invalid
     */
    public static float parseDistance(String distanceText, final int defaultUnit) {
        final Matcher matcher = pattern.matcher(distanceText);

        if (!matcher.find()) {
            throw new NumberFormatException(distanceText);
        }

        final float value = Float.parseFloat(matcher.group(1));
        final String unit = matcher.group(2).toLowerCase();

        if (unit.equals("m") || (unit.length() == 0 && defaultUnit == cgSettings.unitsMetric)) {
            return value / 1000;
        }
        if (unit.equals("km")) {
            return value;
        }
        if (unit.equals("yd")) {
            return value * cgBase.yards2km;
        }
        if (unit.equals("mi")) {
            return value * cgBase.miles2km;
        }
        return value * cgBase.feet2km;
    }

}

@@ -266,18 +266,16 @@
 (%5B0-9%5C%5C.
-%5C%5C
 ,%5D+)%5B %5D*
@@ -960,16 +960,34 @@
 group(1)
+.replace(',', '.')
 );%0A     

Correctly parse distance using commas