Merge branch 'integrate-from-webservice'

Bring in the better implementation of merging gps locations from the
webservice

1 files changed, 1 insertions, 1 deletions

diff --git a/gps.c b/gps.c
index 31be2bbc5..15ee65830 100644
--- a/gps.c
+++ b/gps.c
@@ -242,7 +242,7 @@ void show_gps_locations()
 		map = init_map();
 
 	for_each_dive(idx, dive) {
-		if (dive_has_location(dive)) {
+		if (dive_has_gps_location(dive)) {
 			add_gps_point(map, dive->latitude.udeg / 1000000.0,
 				dive->longitude.udeg / 1000000.0);
 		}