summaryrefslogtreecommitdiff
path: root/geography
diff options
context:
space:
mode:
Diffstat (limited to 'geography')
-rw-r--r--geography/merkaartor/distinfo4
-rw-r--r--geography/merkaartor/patches/patch-aa13
2 files changed, 13 insertions, 4 deletions
diff --git a/geography/merkaartor/distinfo b/geography/merkaartor/distinfo
index 1f3d30d9c00..0ab0a0f40f3 100644
--- a/geography/merkaartor/distinfo
+++ b/geography/merkaartor/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2011/04/11 20:15:00 drochner Exp $
+$NetBSD: distinfo,v 1.9 2011/04/12 17:14:53 drochner Exp $
SHA1 (merkaartor-0.17.2.tar.bz2) = f789141db427bf25bb3b61801fefc98ab0430012
RMD160 (merkaartor-0.17.2.tar.bz2) = c5c8944872828ba5ada6003cd5821f33899da3cb
Size (merkaartor-0.17.2.tar.bz2) = 7138991 bytes
-SHA1 (patch-aa) = a5bdc832ed6a14c9fffe0a6db046cf9842686877
+SHA1 (patch-aa) = bd8ac239c841f47260925a2749063849d67c839f
diff --git a/geography/merkaartor/patches/patch-aa b/geography/merkaartor/patches/patch-aa
index 38fb84a4c76..f2efc1a8365 100644
--- a/geography/merkaartor/patches/patch-aa
+++ b/geography/merkaartor/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2011/04/11 20:15:00 drochner Exp $
+$NetBSD: patch-aa,v 1.4 2011/04/12 17:14:53 drochner Exp $
--- src/GPS/qgpsdevice.cpp.orig 2011-02-10 12:00:35.000000000 +0000
+++ src/GPS/qgpsdevice.cpp
@@ -33,9 +33,18 @@ $NetBSD: patch-aa,v 1.3 2011/04/11 20:15:00 drochner Exp $
{
errno = 0;
gpsdata = Server->read();
-@@ -1027,13 +1026,13 @@ void QGPSDDevice::onDataAvailable()
+@@ -1026,14 +1025,22 @@ void QGPSDDevice::onDataAvailable()
+ setFixStatus(StatusActive);
setLatitude(gpsdata->fix.latitude);
setLongitude(gpsdata->fix.longitude);
++ if (gpsdata->fix.latitude < 0)
++ setLatCardinal(CardinalSouth);
++ else
++ setLatCardinal(CardinalNorth);
++ if (gpsdata->fix.longitude < 0)
++ setLongCardinal(CardinalWest);
++ else
++ setLongCardinal(CardinalEast);
double Alt = gpsdata->fix.altitude;
- if (!__isnan(Alt))
+ if (!std::isnan(Alt))