Fix coordinate parsing #237

Author: tomasbedrich

pycaching/geo.py

@@ -66,7 +66,7 @@ def from_string(cls, string):
         coords = string.replace("N", " ").replace("S", " ").replace("E", " ").replace("W", " ").replace("+", " ")
 
         try:
-            m = re.match(r"\s*(-?\s*\d+)\D+(\d+[\.,]\d+)\D?\s*(-?\s*\d+)\D+(\d+[\.,]\d+)", coords)
+            m = re.match(r"\s*(-?\s*\d+)\D+(\d+[\.,]\d+)\D+(-?\s*\d+)\D+(\d+[\.,]\d+)", coords)
 
             latDeg, latMin, lonDeg, lonMin = [float(part.replace(" ", "").replace(",", ".")) for part in m.groups()]
 

test/test_geo.py

@@ -53,6 +53,9 @@ def test_from_string(self):
         with self.subTest("comma between lat and lon"):
             self.assertEqual(Point.from_string("N 49 45.123, E 013 22.123"), Point(49.75205, 13.36872))
 
+        with self.subTest("comma and space between lat and lon"):
+            self.assertEqual(Point.from_string("N 44° 25.845 , W 72° 02.485"), Point(44.43075, -72.04142))
+
         with self.subTest("marginal values: zeroes"):
             self.assertEqual(Point.from_string("N 49 45.000 E 13 0.0"), Point(49.75, 13.0))