mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compile: mixup of GeoDataCoordinates and GeoDataPoint

Browse source 
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Thiago Macieira 2013-06-07 22:02:00 -07:00 • committed by Dirk Hohndel
parent 0031b64df7
commit 7218fa3568
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qt-ui/globe.cpp
View file

@ -130,10 +130,10 @@ void GlobeGPS::reload()
place->setCoordinate(dive->longitude.udeg / 1000000.0,dive->latitude.udeg / 1000000.0 , 0, GeoDataCoordinates::Degree); 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 // don't add dive locations twice, unless they are at least 50m apart
if (locationMap[QString(dive->location)]) { if (locationMap[QString(dive->location)]) {
GeoDataPoint existingLocation = locationMap[QString(dive->location)]->coordinate(); GeoDataCoordinates existingLocation = locationMap[QString(dive->location)]->coordinate();
GeoDataLineString segment = GeoDataLineString(); GeoDataLineString segment = GeoDataLineString();
segment.append(existingLocation); segment.append(existingLocation);
GeoDataPoint newLocation = place->coordinate(); GeoDataCoordinates newLocation = place->coordinate();
segment.append(newLocation); segment.append(newLocation);
double dist = segment.length(6371); double dist = segment.length(6371);
// the dist is scaled to the radius given - so with 6371km as radius // the dist is scaled to the radius given - so with 6371km as radius