Skip to content

Fix sign error in getSunrise / getSunset methods #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guillerodriguez wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix sign error in getSunrise / getSunset methods #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/luckycatlabs/sunrisesunset/SunriseSunsetCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public Calendar getOfficialSunsetCalendarForDate(Calendar date) {

public static Calendar getSunrise(double latitude, double longitude, TimeZone timeZone, Calendar date, double degrees) {
SolarEventCalculator solarEventCalculator = new SolarEventCalculator(new Location(latitude, longitude), timeZone);
return solarEventCalculator.computeSunriseCalendar(new Zenith(90 - degrees), date);
return solarEventCalculator.computeSunriseCalendar(new Zenith(90 + degrees), date);
}

/**
Expand All @@ -276,7 +276,7 @@ public static Calendar getSunrise(double latitude, double longitude, TimeZone ti

public static Calendar getSunset(double latitude, double longitude, TimeZone timeZone, Calendar date, double degrees) {
SolarEventCalculator solarEventCalculator = new SolarEventCalculator(new Location(latitude, longitude), timeZone);
return solarEventCalculator.computeSunsetCalendar(new Zenith(90 - degrees), date);
return solarEventCalculator.computeSunsetCalendar(new Zenith(90 + degrees), date);
}

/**
Expand Down
30 changes: 30 additions & 0 deletions src/test/java/com/luckycatlabs/sunrisesunset/SunriseSunsetCalculatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static org.junit.Assert.assertEquals;

import java.util.Calendar;
import java.util.TimeZone;

import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -80,6 +81,35 @@ public void testComputeOfficialSunset() {
assertTimeEquals("18:00", calc.getOfficialSunsetForDate(eventDate), eventDate.getTime().toString());
}

@Test
public void testComputeSunriseArbitraryDegrees() {
TimeZone tz = TimeZone.getTimeZone("America/New_York");

assertHourMinuteEquals(calc.getCivilSunriseCalendarForDate(eventDate),
SunriseSunsetCalculator.getSunrise(39.9937, -75.7850, tz, eventDate, 6.0));
assertHourMinuteEquals(calc.getNauticalSunriseCalendarForDate(eventDate),
SunriseSunsetCalculator.getSunrise(39.9937, -75.7850, tz, eventDate, 12.0));
assertHourMinuteEquals(calc.getAstronomicalSunriseCalendarForDate(eventDate),
SunriseSunsetCalculator.getSunrise(39.9937, -75.7850, tz, eventDate, 18.0));
}

@Test
public void testComputeSunsetArbitraryDegrees() {
TimeZone tz = TimeZone.getTimeZone("America/New_York");

assertHourMinuteEquals(calc.getCivilSunsetCalendarForDate(eventDate),
SunriseSunsetCalculator.getSunset(39.9937, -75.7850, tz, eventDate, 6.0));
assertHourMinuteEquals(calc.getNauticalSunsetCalendarForDate(eventDate),
SunriseSunsetCalculator.getSunset(39.9937, -75.7850, tz, eventDate, 12.0));
assertHourMinuteEquals(calc.getAstronomicalSunsetCalendarForDate(eventDate),
SunriseSunsetCalculator.getSunset(39.9937, -75.7850, tz, eventDate, 18.0));
}

private static void assertHourMinuteEquals(Calendar expected, Calendar actual) {
assertEquals(expected.get(Calendar.HOUR_OF_DAY), actual.get(Calendar.HOUR_OF_DAY));
assertEquals(expected.get(Calendar.MINUTE), actual.get(Calendar.MINUTE));
}

@Test
public void testSpecificDateLocationAndTimezone() {
Location loc = new Location("55.03", "82.91");
Expand Down