[PATCH] Changes test for ISO 6709 location format

Tim Wootton tim at tee-jay.demon.co.uk
Mon Jan 13 13:26:25 UTC 2014


As discussed with Mika this changes the ISO 6709 detection to use:
	1st non-whitespace character is a digit and
        number of commas is even.

The idea is that, as all the other formats seperate the lat from
long with a single comma, additional even numbers of commas could
ocour in locales where comma is used as a decimal point, but in
total an even number of commas (often 0) would indicate an ISO
format entry.

Signed-off-by: Tim Wootton <tim at tee-jay.demon.co.uk>
---
 qthelper.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qthelper.cpp b/qthelper.cpp
index cd47209..acdb7c2 100644
--- a/qthelper.cpp
+++ b/qthelper.cpp
@@ -119,7 +119,8 @@ bool parseGpsText(const QString& gps_text, double *latitude, double *longitude)
 
 	// ISO 6709 Annex D representation
 	// http://en.wikipedia.org/wiki/ISO_6709#Representation_at_the_human_interface_.28Annex_D.29
-	if (gps_text.at(0).isDigit() && gps_text.count(UTF8_DEGREE) > 0) {
+	// e.g. 52°49'02.388"N 1°36'17.388"E
+	if (gps_text.at(0).isDigit() && (gps_text.count(",") % 2) == 0) {
 		gpsStyle = ISO6709D;
 		regExp = QString("(\\d+)[" UTF8_DEGREE "\\s](\\d+)[\'\\s](\\d+)([,\\.](\\d+))?[\"\\s]([NS%1%2])"
 					 "\\s*(\\d+)[" UTF8_DEGREE "\\s](\\d+)[\'\\s](\\d+)([,\\.](\\d+))?[\"\\s]([EW%3%4])")
-- 
1.8.5.2



More information about the subsurface mailing list