summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar g1g19 <gopichandpaturi@gmail.com>2014-03-03 22:31:13 +0530
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-03-03 09:56:02 -0800
commit917ce5aff50370e7dc4805920a4f5eec09884bb3 (patch)
tree811ece3cf59809c4beafe3a5e17392df092db578
parent9b0817596df87d06cb8606a92602600694add98a (diff)
downloadsubsurface-917ce5aff50370e7dc4805920a4f5eec09884bb3.tar.gz
Fix gps parsing
The argument index used to pull in the translated hemisphere letters was incorrect. Fixes #418 Signed-off-by: Gopichand Paturi <gopichandpaturi@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qthelper.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qthelper.cpp b/qthelper.cpp
index 352d3c4bd..8ad85402a 100644
--- a/qthelper.cpp
+++ b/qthelper.cpp
@@ -136,7 +136,7 @@ bool parseGpsText(const QString &gps_text, double *latitude, double *longitude)
} else if (gps_text.count(QChar('"')) == 2) {
gpsStyle = SECONDS;
regExp = QString("\\s*([NS%1%2])\\s*(\\d+)[" UTF8_DEGREE "\\s]+(\\d+)[\'\\s]+(\\d+)([,\\.](\\d+))?[^EW%3%4]*"
- "([EW%6%7])\\s*(\\d+)[" UTF8_DEGREE "\\s]+(\\d+)[\'\\s]+(\\d+)([,\\.](\\d+))?")
+ "([EW%5%6])\\s*(\\d+)[" UTF8_DEGREE "\\s]+(\\d+)[\'\\s]+(\\d+)([,\\.](\\d+))?")
.arg(tr("N"))
.arg(tr("S"))
.arg(tr("E"))
@@ -146,7 +146,7 @@ bool parseGpsText(const QString &gps_text, double *latitude, double *longitude)
} else if (gps_text.count(QChar('\'')) == 2) {
gpsStyle = MINUTES;
regExp = QString("\\s*([NS%1%2])\\s*(\\d+)[" UTF8_DEGREE "\\s]+(\\d+)([,\\.](\\d+))?[^EW%3%4]*"
- "([EW%6%7])\\s*(\\d+)[" UTF8_DEGREE "\\s]+(\\d+)([,\\.](\\d+))?")
+ "([EW%5%6])\\s*(\\d+)[" UTF8_DEGREE "\\s]+(\\d+)([,\\.](\\d+))?")
.arg(tr("N"))
.arg(tr("S"))
.arg(tr("E"))