coords

kdudkov · Nov 23, 2024 · 60505ce · 60505ce
1 parent c4d9d31
commit 60505ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/coord/strings.go b/pkg/coord/strings.go
@@ -7,9 +7,9 @@ import (
 )
 
 var (
-	r1 = regexp.MustCompile(`[xX]=?(?P<x>\d{5,}),?\s+[yY]=?(?P<y>\d{5,})`)
-	r2 = regexp.MustCompile(`(?P<x>-?\d+\.\d+),?\s+(?P<y>-?\d+\.\d+)`)
-	r3 = regexp.MustCompile(`(?P<x>\d+\.\d+)([nNsS]),?\s+(?P<y>\d+\.\d+)([eEwW])`)
+	r1 = regexp.MustCompile(`[xX]=?(?P<x>\d{5,})[;,\s]*[yY]=?(?P<y>\d{5,})`)
+	r2 = regexp.MustCompile(`(?P<x>-?\d+\.\d+)[;,\s]*(?P<y>-?\d+\.\d+)`)
+	r3 = regexp.MustCompile(`(?P<x>\d+\.\d+)([nNsS])[;,\s]*(?P<y>\d+\.\d+)([eEwW])`)
 )
 
 func StringToLatLon(s string) (float64, float64, error) {

diff --git a/pkg/coord/strings_test.go b/pkg/coord/strings_test.go
@@ -14,7 +14,9 @@ type testData struct {
 func TestStringConvert(t *testing.T) {
 	data := []testData{
 		{"x5709130 y6648746", 51.49220977324127, 35.14007432073522},
+		{"x5709130y6648746", 51.49220977324127, 35.14007432073522},
 		{"X=5709130, y6648746", 51.49220977324127, 35.14007432073522},
+		{"X=5709130,y6648746", 51.49220977324127, 35.14007432073522},
 		{"51.49 35.14", 51.49, 35.14},
 		{"51.49,  -35.14", 51.49, -35.14},
 		{"51.49N  35.14E", 51.49, 35.14},