From 6bebb3d782de2fb9ac266c9ac80f4312730bb7ea Mon Sep 17 00:00:00 2001
From: Darren Croton <dcroton@astro.swin.edu.au>
Date: Sun, 30 Apr 2017 10:48:53 +1000
Subject: [PATCH] When lat & lon don't have values show --:-- instead of
 nothing for sunrise and sunset

---
 bin/SnapshotWatch.prg           | Bin 61084 -> 60449 bytes
 bin/SnapshotWatch.prg.debug.xml | 106 ++++++++++++++++----------------
 source/SnapshotWatchView.mc     |  16 ++---
 3 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/bin/SnapshotWatch.prg b/bin/SnapshotWatch.prg
index 1259d73748dc4a8d6758fe9bcbdb0535d128e8d6..65ee57c4053c998696011a28334bff80d8fd6a67 100644
GIT binary patch
delta 7797
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

delta 8425
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
Tw98_PdvxxBN7VthO}hUBE$V&c

diff --git a/bin/SnapshotWatch.prg.debug.xml b/bin/SnapshotWatch.prg.debug.xml
index 639291f..334b667 100644
--- a/bin/SnapshotWatch.prg.debug.xml
+++ b/bin/SnapshotWatch.prg.debug.xml
@@ -268,46 +268,47 @@
 <entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="516" pc="268443648" symbol="drawSunriseSunset"/>
 <entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="517" pc="268443672" symbol="drawSunriseSunset"/>
 <entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="518" pc="268443672" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="520" pc="268443672" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="521" pc="268443695" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="523" pc="268443702" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="524" pc="268443736" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="528" pc="268443773" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="529" pc="268443811" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="530" pc="268443846" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="531" pc="268443884" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="537" pc="268443919" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="539" pc="268443936" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="540" pc="268443936" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="542" pc="268443936" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="543" pc="268443988" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="544" pc="268444033" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="546" pc="268444078" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="547" pc="268444109" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="549" pc="268444140" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="550" pc="268444147" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="551" pc="268444164" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="553" pc="268444174" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="554" pc="268444269" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="556" pc="268444347" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="557" pc="268444354" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="558" pc="268444371" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="560" pc="268444381" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="561" pc="268444476" symbol="drawSunriseSunset"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="568" pc="268444558" symbol="to12hourFormat"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="570" pc="268444562" symbol="to12hourFormat"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="571" pc="268444572" symbol="to12hourFormat"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="572" pc="268444583" symbol="to12hourFormat"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="574" pc="268444593" symbol="to12hourFormat"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="578" pc="268444597" symbol="authenticate"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="580" pc="268444601" symbol="authenticate"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="5" pc="268444613" symbol="initialize"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="6" pc="268444617" symbol="initialize"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="10" pc="268444636" symbol="onStart"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="14" pc="268444641" symbol="onStop"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="18" pc="268444646" symbol="getInitialView"/>
-<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="19" pc="268444650" symbol="getInitialView"/>
-<entry filename="Rez" lineNum="41" pc="268444688" symbol="WatchFace"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="519" pc="268443672" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="520" pc="268443679" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="523" pc="268443686" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="524" pc="268443709" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="526" pc="268443716" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="527" pc="268443750" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="531" pc="268443787" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="532" pc="268443825" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="533" pc="268443860" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="534" pc="268443898" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="540" pc="268443933" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="542" pc="268443950" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="544" pc="268443950" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="545" pc="268444002" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="546" pc="268444047" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="548" pc="268444092" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="549" pc="268444123" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="551" pc="268444154" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="552" pc="268444161" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="553" pc="268444178" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="554" pc="268444188" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="556" pc="268444283" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="557" pc="268444290" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="558" pc="268444307" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="559" pc="268444317" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="562" pc="268444415" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="563" pc="268444493" symbol="drawSunriseSunset"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="568" pc="268444572" symbol="to12hourFormat"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="570" pc="268444576" symbol="to12hourFormat"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="571" pc="268444586" symbol="to12hourFormat"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="572" pc="268444597" symbol="to12hourFormat"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="574" pc="268444607" symbol="to12hourFormat"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="578" pc="268444611" symbol="authenticate"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchView.mc" lineNum="580" pc="268444615" symbol="authenticate"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="5" pc="268444627" symbol="initialize"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="6" pc="268444631" symbol="initialize"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="10" pc="268444650" symbol="onStart"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="14" pc="268444655" symbol="onStop"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="18" pc="268444660" symbol="getInitialView"/>
+<entry filename="/Users/dcroton/Documents/Eclipse/SnapshotWatch/source/SnapshotWatchApp.mc" lineNum="19" pc="268444664" symbol="getInitialView"/>
+<entry filename="Rez" lineNum="41" pc="268444702" symbol="WatchFace"/>
 </pcToLineNum>
 <symbolTable>
 <entry id="8389719" method="true" symbol="round"/>
@@ -491,18 +492,19 @@
 <entry endPc="268443640" name="offsetHour" stackId="3" startPc="268443369"/>
 <entry endPc="268443640" name="ampm" stackId="4" startPc="268443369"/>
 <entry endPc="268443640" name="timeString" stackId="5" startPc="268443369"/>
-<entry endPc="268444554" name="now" stackId="8" startPc="268443936"/>
-<entry endPc="268444554" name="ampm" stackId="6" startPc="268443936"/>
-<entry endPc="268444554" name="timeInfoSunrise" stackId="11" startPc="268443936"/>
-<entry endPc="268444554" name="timeInfoSunset" stackId="12" startPc="268443936"/>
-<entry endPc="268444554" name="timeString" stackId="7" startPc="268443936"/>
-<entry endPc="268444554" name="sunrise_moment" stackId="9" startPc="268443936"/>
-<entry endPc="268444554" name="sunset_moment" stackId="10" startPc="268443936"/>
-<entry endPc="268444557" name="lat" stackId="3" startPc="268443648"/>
-<entry endPc="268444557" name="loc" stackId="5" startPc="268443648"/>
-<entry endPc="268444557" name="lon" stackId="4" startPc="268443648"/>
-<entry endPc="268444557" name="sc" stackId="2" startPc="268443648"/>
-<entry endPc="268444596" name="hour12" stackId="2" startPc="268444562"/>
+<entry endPc="268444412" name="now" stackId="9" startPc="268443950"/>
+<entry endPc="268444412" name="ampm" stackId="8" startPc="268443950"/>
+<entry endPc="268444412" name="timeInfoSunrise" stackId="12" startPc="268443950"/>
+<entry endPc="268444412" name="timeInfoSunset" stackId="13" startPc="268443950"/>
+<entry endPc="268444412" name="sunrise_moment" stackId="10" startPc="268443950"/>
+<entry endPc="268444412" name="sunset_moment" stackId="11" startPc="268443950"/>
+<entry endPc="268444571" name="timeStringRise" stackId="5" startPc="268443648"/>
+<entry endPc="268444571" name="lat" stackId="3" startPc="268443648"/>
+<entry endPc="268444571" name="loc" stackId="7" startPc="268443648"/>
+<entry endPc="268444571" name="lon" stackId="4" startPc="268443648"/>
+<entry endPc="268444571" name="sc" stackId="2" startPc="268443648"/>
+<entry endPc="268444571" name="timeStringSet" stackId="6" startPc="268443648"/>
+<entry endPc="268444610" name="hour12" stackId="2" startPc="268444576"/>
 </localVars>
 <annotations/>
 <functions>
diff --git a/source/SnapshotWatchView.mc b/source/SnapshotWatchView.mc
index f7f2e5b..23050c8 100644
--- a/source/SnapshotWatchView.mc
+++ b/source/SnapshotWatchView.mc
@@ -516,6 +516,9 @@ class SnapshotWatchView extends Ui.WatchFace {
 		var sc = new SunCalc();
 		var lat;
 		var lon;
+		var timeStringRise = " --:--";
+		var timeStringSet = " --:--";
+
 		
 		var loc = Activity.getActivityInfo().currentLocation;
 		if (loc == null)
@@ -537,7 +540,6 @@ class SnapshotWatchView extends Ui.WatchFace {
 		if(lat != null && lon != null)
 		{
 			var ampm;
-			var timeString;
 			
 			var now = new Time.Moment(Time.now().value());			
 			var sunrise_moment = sc.calculate(now, lat.toDouble(), lon.toDouble(), SUNRISE);
@@ -549,18 +551,16 @@ class SnapshotWatchView extends Ui.WatchFace {
 			ampm = "a";
     		if (timeInfoSunrise.hour >= 12)
     			{ ampm = "p"; }
-    	
-        	timeString = Lang.format("$1$:$2$$3$", [to12hourFormat(timeInfoSunrise.hour), timeInfoSunrise.min.format("%02d"), ampm]);
-        	dc.drawText(3, height_screen/2 - 14, Gfx.FONT_SMALL, timeString, Gfx.TEXT_JUSTIFY_LEFT|Graphics.TEXT_JUSTIFY_VCENTER);
+        	timeStringRise = Lang.format("$1$:$2$$3$", [to12hourFormat(timeInfoSunrise.hour), timeInfoSunrise.min.format("%02d"), ampm]);
 
 			ampm = "a";
     		if (timeInfoSunset.hour >= 12)
     			{ ampm = "p"; }
-    	
-        	timeString = Lang.format("$1$:$2$$3$", [to12hourFormat(timeInfoSunset.hour), timeInfoSunset.min.format("%02d"), ampm]);
-        	dc.drawText(3, height_screen/2 + 11, Gfx.FONT_SMALL, timeString, Gfx.TEXT_JUSTIFY_LEFT|Graphics.TEXT_JUSTIFY_VCENTER);
-
+        	timeStringSet = Lang.format("$1$:$2$$3$", [to12hourFormat(timeInfoSunset.hour), timeInfoSunset.min.format("%02d"), ampm]);
 		}
+		
+        dc.drawText(3, height_screen/2 - 14, Gfx.FONT_SMALL, timeStringRise, Gfx.TEXT_JUSTIFY_LEFT|Graphics.TEXT_JUSTIFY_VCENTER);
+       	dc.drawText(3, height_screen/2 + 11, Gfx.FONT_SMALL, timeStringSet, Gfx.TEXT_JUSTIFY_LEFT|Graphics.TEXT_JUSTIFY_VCENTER);		
 
 	}