From b7e53aaee6703c27061037dfadd657f5fc301559 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Thu, 12 Feb 2015 19:01:27 -0800
Subject: Change from locations to dive sites in save-html and worldmap

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 save-html.c     |  9 ++++++---
 worldmap-save.c | 10 +++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/save-html.c b/save-html.c
index d67931d8f..13d2fd559 100644
--- a/save-html.c
+++ b/save-html.c
@@ -172,8 +172,11 @@ void put_HTML_samples(struct membuffer *b, struct dive *dive)
 
 void put_HTML_coordinates(struct membuffer *b, struct dive *dive)
 {
-	degrees_t latitude = dive->latitude;
-	degrees_t longitude = dive->longitude;
+	struct dive_site *ds = get_dive_site_for_dive(dive);
+	if (!ds)
+		return;
+	degrees_t latitude = ds->latitude;
+	degrees_t longitude = ds->longitude;
 
 	//don't put coordinates if in (0,0)
 	if (!latitude.udeg && !longitude.udeg)
@@ -304,7 +307,7 @@ void write_one_dive(struct membuffer *b, struct dive *dive, const char *photos_d
 	put_format(b, "\"subsurface_number\":%d,", dive->number);
 	put_HTML_date(b, dive, "\"date\":\"", "\",");
 	put_HTML_time(b, dive, "\"time\":\"", "\",");
-	write_attribute(b, "location", dive->location, ", ");
+	write_attribute(b, "location", get_dive_location(dive), ", ");
 	put_HTML_coordinates(b, dive);
 	put_format(b, "\"rating\":%d,", dive->rating);
 	put_format(b, "\"visibility\":%d,", dive->visibility);
diff --git a/worldmap-save.c b/worldmap-save.c
index a7e9d82c2..22bfe583e 100644
--- a/worldmap-save.c
+++ b/worldmap-save.c
@@ -27,11 +27,11 @@ void writeMarkers(struct membuffer *b, const bool selected_only)
 			if (!dive->selected)
 				continue;
 		}
-		if (dive->latitude.udeg == 0 && dive->longitude.udeg == 0)
+		struct dive_site *ds = get_dive_site_for_dive(dive);
+		if (!ds || !dive_site_has_gps_location(ds))
 			continue;
-
-		put_degrees(b, dive->latitude, "temp = new google.maps.Marker({position: new google.maps.LatLng(", "");
-		put_degrees(b, dive->longitude, ",", ")});\n");
+		put_degrees(b, ds->latitude, "temp = new google.maps.Marker({position: new google.maps.LatLng(", "");
+		put_degrees(b, ds->longitude, ",", ")});\n");
 		put_string(b, "markers.push(temp);\ntempinfowindow = new google.maps.InfoWindow({content: '<div id=\"content\">'+'<div id=\"siteNotice\">'+'</div>'+'<div id=\"bodyContent\">");
 		snprintf(pre, sizeof(pre), "<p>%s ", translate("gettextFromC", "Date:"));
 		put_HTML_date(b, dive, pre, "</p>");
@@ -49,7 +49,7 @@ void writeMarkers(struct membuffer *b, const bool selected_only)
 		put_HTML_watertemp(b, dive, pre, "</p>");
 		snprintf(pre, sizeof(pre), "<p>%s <b>", translate("gettextFromC", "Location:"));
 		put_string(b, pre);
-		put_HTML_quoted(b, dive->location);
+		put_HTML_quoted(b, get_dive_location(dive));
 		put_string(b, "</b></p>");
 		snprintf(pre, sizeof(pre), "<p> %s ", translate("gettextFromC", "Notes:"));
 		put_HTML_notes(b, dive, pre, " </p>");
-- 
cgit v1.2.3-70-g09d2