Skip to content

Commit 80dd3ba

Browse files
authored
Merge pull request #2 from exploded/claude/update-riseset-module-b5NfI
Update app to handle riseset module changes
2 parents dd12813 + cd02e00 commit 80dd3ba

File tree

5 files changed

+22
-12
lines changed

5 files changed

+22
-12
lines changed

calendar.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ <h1 class="header-title">📅 Moon Rise and Set Calendar</h1>
4242
{{ range .Rows }}
4343
<tr>
4444
<td>{{.Date}}</td>
45-
<td>{{.Moon.Rise}}</td>
46-
<td>{{.Moon.Set}}</td>
47-
<td>{{.Sun.Rise}}</td>
48-
<td>{{.Sun.Set}}</td>
45+
<td>{{if .Moon.AlwaysAbove}}Always above{{else if .Moon.AlwaysBelow}}Always below{{else}}{{.Moon.Rise}}{{end}}</td>
46+
<td>{{if .Moon.AlwaysAbove}}Always above{{else if .Moon.AlwaysBelow}}Always below{{else}}{{.Moon.Set}}{{end}}</td>
47+
<td>{{if .Sun.AlwaysAbove}}Always above{{else if .Sun.AlwaysBelow}}Always below{{else}}{{.Sun.Rise}}{{end}}</td>
48+
<td>{{if .Sun.AlwaysAbove}}Always above{{else if .Sun.AlwaysBelow}}Always below{{else}}{{.Sun.Set}}{{end}}</td>
4949
</tr>
5050
{{ end }}
5151
</tbody>

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module moon
22

3-
go 1.21
3+
go 1.24.7
44

5-
require github.com/exploded/riseset v1.0.0
5+
require github.com/exploded/riseset v1.0.1-0.20260220080739-24891d86367a

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
github.com/exploded/riseset v1.0.0 h1:qdXzKgiEieF8hJSvmONRYcX4QalBMkFnUf1xuW6YIxM=
22
github.com/exploded/riseset v1.0.0/go.mod h1:VjRq5iJAosiDcmN6cIemg4Koh/g/MirLmI9djQoiuYs=
3+
github.com/exploded/riseset v1.0.1-0.20260220080739-24891d86367a h1:9zXloV9qOl/7d9DUghsbK2l0w1xM0ebmEjMWk8KCS4Y=
4+
github.com/exploded/riseset v1.0.1-0.20260220080739-24891d86367a/go.mod h1:iSOrtnvmvgDPXhfjH+isdiLP0aTLSlIExl2z6Tulizg=

moon.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@ func calendar(w http.ResponseWriter, r *http.Request) {
214214
for i := 0; i < 10; i++ {
215215
newdate = newdate.AddDate(0, 0, 1)
216216
arow.Date = newdate.Format("02-01-2006")
217-
arow.Moon = riseset.Riseset(1, newdate, Lon, Lat, Zon)
218-
arow.Sun = riseset.Riseset(2, newdate, Lon, Lat, Zon)
217+
arow.Moon = riseset.Riseset(riseset.Moon, newdate, Lon, Lat, Zon)
218+
arow.Sun = riseset.Riseset(riseset.Sun, newdate, Lon, Lat, Zon)
219219
Passme.Rows = append(Passme.Rows, arow)
220220
}
221221

@@ -299,7 +299,7 @@ func gettimes(w http.ResponseWriter, r *http.Request) {
299299
var newdate time.Time
300300
zondur = time.Hour * time.Duration(zon)
301301
newdate = time.Now().Add(zondur)
302-
mydata = riseset.Riseset(1, newdate, lon, lat, zon)
302+
mydata = riseset.Riseset(riseset.Moon, newdate, lon, lat, zon)
303303
}
304304
json.NewEncoder(w).Encode(mydata)
305305
}

static/script.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,12 +293,20 @@ const getTimes = function () {
293293

294294
$.getJSON(`gettimes?lon=${mylon}&lat=${mylat}&zon=${zon}`)
295295
.done((json) => {
296-
if (json.Rise && json.Set) {
296+
if (json.Rise === "error" || json.Set === "error") {
297+
showErrorMessage('Unable to calculate moon times for this location.');
298+
} else if (json.AlwaysAbove) {
299+
updateInputField("Rise", "Always above horizon");
300+
updateInputField("Set", "Always above horizon");
301+
clearErrorMessage();
302+
} else if (json.AlwaysBelow) {
303+
updateInputField("Rise", "Always below horizon");
304+
updateInputField("Set", "Always below horizon");
305+
clearErrorMessage();
306+
} else if (json.Rise && json.Set) {
297307
updateInputField("Rise", json.Rise);
298308
updateInputField("Set", json.Set);
299309
clearErrorMessage();
300-
} else if (json.Rise === "error" || json.Set === "error") {
301-
showErrorMessage('Unable to calculate moon times for this location.');
302310
}
303311
})
304312
.fail((jqXHR, textStatus, errorThrown) => {

0 commit comments

Comments
 (0)