Merge branch 'length-of-day-ms'

README.md

@@ -24,7 +24,7 @@ maven { url "https://dl.bintray.com/caarmen/maven/" }
 
 Declare the dependency:
 ```
-compile 'ca.rmen:lib-sunrise-sunset:1.1.0'
+compile 'ca.rmen:lib-sunrise-sunset:1.1.1'
 ```
 Maven:
 ------
@@ -40,15 +40,17 @@ Declare the dependency:
 <dependency>
  <groupId>ca.rmen</groupId>
  <artifactId>lib-sunrise-sunset</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
  <scope>compile</scope>
 </dependency>
 ```
 
 Any other build system:
 -------------------
+
 Alternatively, you can just copy the single java file into your project:
 [library/src/main/java/ca/rmen/sunrisesunset/SunriseSunset.java](library/src/main/java/ca/rmen/sunrisesunset/SunriseSunset.java)
+
 Using the library
 =================
 To get the sunrise and sunset times for today in Paris, France:
@@ -73,6 +75,44 @@ System.out.println("Astronomical twilight stops at: " + astronomicalTwilight[0].
 System.out.println("Astronomical twilight starts at: " + astronomicalTwilight[1].getTime());
 ```
 
+Command-line interface
+======================
+
+A command-line tool is provided. You can download it from the [releases page](https://github.com/caarmen/SunriseSunset/releases)
+or build it with `mvn clean package`, which will place it in `cli/target`.
+
+Usage:
+
+```
+java -jar /path/to/sunrise-sunset-cli-1.1.1.jar <timezone> <yyyyMMdd> <latitude> <longitude>
+```
+
+Example usage:
+```
+java -jar /path/to/sunrise-sunset-cli-1.1.1.jar Europe/Paris 20171125 48.8 2.35
+Current time at: 48.8,2.35:
+  2017-11-25 18:01:42 Central European Time
+Current day period is NAUTICAL_TWILIGHT
+Day is 31588000 milliseconds long
+Lookup for date:
+  2017-11-25 12:00:00 Central European Time
+Sunrise, Sunset:
+  2017-11-25 08:15:53 Central European Time
+  2017-11-25 17:02:21 Central European Time
+Civil twilight:
+  2017-11-25 07:40:16 Central European Time
+  2017-11-25 17:37:58 Central European Time
+Nautical twilight:
+  2017-11-25 07:01:06 Central European Time
+  2017-11-25 18:17:08 Central European Time
+Astronomical twilight:
+  2017-11-25 06:23:26 Central European Time
+  2017-11-25 18:54:48 Central European Time
+Solar noon:
+  2017-11-25 12:39:07 Central European Time
+```
+
+
 Documentation
 =============
 Javadoc is here: http://caarmen.github.io/SunriseSunset/ca/rmen/sunrisesunset/SunriseSunset.html

cli/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 	Sunrise Sunset Calculator.
-	Copyright (C) 2013-2015 Carmen Alvarez
+	Copyright (C) 2013-2017 Carmen Alvarez
 
 	This library is free software; you can redistribute it and/or
 	modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>ca.rmen</groupId>
 		<artifactId>sunrise-sunset</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.1</version>
 	</parent>
 
 	<artifactId>sunrise-sunset-cli</artifactId>

cli/src/main/java/ca/rmen/sunrisesunset/cli/SunriseSunsetCLI.java

@@ -60,7 +60,7 @@ public static void main(String[] args) throws Throwable {
 
 		System.out.println("Current day period is " + SunriseSunset.getDayPeriod(now, latitude, longitude));
 		long dayLength = SunriseSunset.getDayLength(now, latitude, longitude);
-		System.out.println("Day is " + dayLength + " seconds long");
+		System.out.println("Day is " + dayLength + " milliseconds long");
 
 		System.out.println("Lookup for date:");
 		printCalendar(tz, day);

library/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 	Sunrise Sunset Calculator.
-	Copyright (C) 2013-2015 Carmen Alvarez
+	Copyright (C) 2013-2017 Carmen Alvarez
 
 	This library is free software; you can redistribute it and/or
 	modify it under the terms of the GNU Lesser General Public
@@ -27,12 +27,12 @@
 	<parent>
 		<groupId>ca.rmen</groupId>
 		<artifactId>sunrise-sunset</artifactId>
-		<version>1.1.0</version>
+		<version>1.1.1</version>
 	</parent>
 
 	<artifactId>lib-sunrise-sunset</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<name>lib-sunrise-sunset</name>
 	<url>http://rmen.ca</url>
 

library/src/main/java/ca/rmen/sunrisesunset/SunriseSunset.java

@@ -67,7 +67,7 @@ public enum DayPeriod {
 	private static final int JULIAN_DATE_2000_01_01 = 2451545;
 	private static final double CONST_0009 = 0.0009;
 	private static final double CONST_360 = 360;
-	private static final long SECONDS_IN_DAY = 60 * 60 * 24;
+	private static final long MILLISECONDS_IN_DAY = 60 * 60 * 24 * 1000;
 
 	/**
 	 * Intermediate variables used in the sunrise equation
@@ -617,8 +617,8 @@ public static boolean isTwilight(double latitude, double longitude) {
 	 * @param latitude  the latitude of the location in degrees.
 	 * @param longitude the longitude of the location in degrees (West is negative)
 	 * @param calendar the given datetime to check for twilight
-     * @return true if at the given location and calendar, it is civil, nautical, or astronomical twilight.
-     */
+	 * @return true if at the given location and calendar, it is civil, nautical, or astronomical twilight.
+	 */
 	public static boolean isTwilight(Calendar calendar, double latitude, double longitude) {
 		return isCivilTwilight(calendar, latitude, longitude)
 				|| isNauticalTwilight(calendar, latitude, longitude)
@@ -639,27 +639,27 @@ public static DayPeriod getDayPeriod(Calendar calendar, double latitude, double
 	 * @param calendar the datetime for which to determine the day length
 	 * @param latitude  the latitude of the location in degrees.
 	 * @param longitude the longitude of the location in degrees (West is negative)
-     * @return the number of milliseconds between sunrise and sunset.
-     */
+	 * @return the number of milliseconds between sunrise and sunset.
+	 */
 	public static long getDayLength(Calendar calendar, double latitude, double longitude) {
 		Calendar[] sunriseSunset = getSunriseSunset(calendar, latitude, longitude);
 		if (sunriseSunset == null) {
 			int month = calendar.get(Calendar.MONTH); // Reminder: January = 0
 			if (latitude > 0) {
 				if (month >= 3 && month <= 10) {
-					return SECONDS_IN_DAY; // Always day at the north pole in June
+					return MILLISECONDS_IN_DAY; // Always day at the north pole in June
 				} else {
 					return 0; // Always night at the north pole in December
 				}
 			} else {
 				if (month >= 3 && month <= 10) {
 					return 0; // Always night at the south pole in June
 				} else {
-					return SECONDS_IN_DAY; // Always day at the south pole in December
+					return MILLISECONDS_IN_DAY; // Always day at the south pole in December
 				}
 			}
 		}
-		return (sunriseSunset[1].getTimeInMillis() - sunriseSunset[0].getTimeInMillis()) / 1000;
+		return sunriseSunset[1].getTimeInMillis() - sunriseSunset[0].getTimeInMillis();
 	}
 
 }

library/src/test/java/ca/rmen/sunrisesunset/test/SunriseSunsetSpecificLocationsTest.java

@@ -94,7 +94,7 @@ public void testAntarctica() {
         SunriseSunsetTestUtils.testGetDayPeriod("Antarctica/McMurdo", "20151221 12:00", -77.8456, 166.6693, SunriseSunset.DayPeriod.DAY);
         SunriseSunsetTestUtils.testGetDayPeriod("Antarctica/McMurdo", "20151221 18:00", -77.8456, 166.6693, SunriseSunset.DayPeriod.DAY);
         SunriseSunsetTestUtils.testGetDayPeriod("Antarctica/McMurdo", "20151221 23:00", -77.8456, 166.6693, SunriseSunset.DayPeriod.DAY);
-        SunriseSunsetTestUtils.testDayLength("Antarctica/McMurdo", "20151221", -77.8456, 166.6693, 86400);
+        SunriseSunsetTestUtils.testDayLength("Antarctica/McMurdo", "20151221", -77.8456, 166.6693, 86400000);
 
     }
 

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 	Sunrise Sunset Calculator.
-	Copyright (C) 2013-2015 Carmen Alvarez
+	Copyright (C) 2013-2017 Carmen Alvarez
 
 	This library is free software; you can redistribute it and/or
 	modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
 	<groupId>ca.rmen</groupId>
 	<artifactId>sunrise-sunset</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<name>sunrise-sunset</name>
 	<description>Provides methods to determine the sunrise, sunset, civil twilight,nautical twilight, and astronomical twilight times of a given location, or if it is currently day or night at a given location.</description>
 	<url>http://github.com/caarmen/SunriseSunset</url>

publish.pom

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 	Sunrise Sunset Calculator.
-	Copyright (C) 2013-2016 Carmen Alvarez
+	Copyright (C) 2013-2017 Carmen Alvarez
 
 	This library is free software; you can redistribute it and/or
 	modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ca.rmen</groupId>
 	<artifactId>lib-sunrise-sunset</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.1</version>
 	<packaging>jar</packaging>
 
 	<name>sunrise-sunset</name>