[PATCH] Fix compile: mixup of GeoDataCoordinates and GeoDataPoint

Thiago Macieira thiago at macieira.org
Fri Jun 7 22:02:00 PDT 2013


Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
 qt-ui/globe.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index 7781189..24806d5 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -130,10 +130,10 @@ void GlobeGPS::reload()
 			place->setCoordinate(dive->longitude.udeg / 1000000.0,dive->latitude.udeg / 1000000.0 , 0, GeoDataCoordinates::Degree);
 			// don't add dive locations twice, unless they are at least 50m apart
 			if (locationMap[QString(dive->location)]) {
-				GeoDataPoint existingLocation = locationMap[QString(dive->location)]->coordinate();
+				GeoDataCoordinates existingLocation = locationMap[QString(dive->location)]->coordinate();
 				GeoDataLineString segment = GeoDataLineString();
 				segment.append(existingLocation);
-				GeoDataPoint newLocation = place->coordinate();
+				GeoDataCoordinates newLocation = place->coordinate();
 				segment.append(newLocation);
 				double dist = segment.length(6371);
 				// the dist is scaled to the radius given - so with 6371km as radius
-- 
1.7.11.7



More information about the subsurface mailing list