natural-time-js 1.0.2 → 1.0.4

package/context.js

@@ -1,9 +1,8 @@
 import { NaturalDate } from './index.js';
-import { Body, Observer, SearchHourAngle, SearchRiseSet, SearchAltitude, MoonPhase, Equator, Horizon } from 'astronomy-engine/astronomy';
+import { Body, Observer, SearchHourAngle, SearchRiseSet, SearchAltitude, MoonPhase, Equator, Horizon, Seasons } from 'astronomy-engine';
 
-// Improve performance with cached astronomical calculations
-const SUN_CACHE = {};
-const MOON_CACHE = {};
+// Caching recuring astronomical calculations
+const ASTRO_CACHE = {};
 
 /**
  * SUN ALTITUDE
@@ -39,10 +38,11 @@ export function NaturalSunAltitude(naturalDate, latitude) {
  */
 export function NaturalSunEvents(naturalDate, latitude) {
 
-    let cache_id = naturalDate.toDateString() + latitude + naturalDate.longitude;
+    let cache_id = `SUN_${naturalDate.toDateString()}_${latitude}_${naturalDate.longitude}`;
     
-    if(SUN_CACHE?.[cache_id])
-		return SUN_CACHE[cache_id];
+    if (ASTRO_CACHE[cache_id]) {
+        return ASTRO_CACHE[cache_id];
+    }
 
     let observer = new Observer(latitude, naturalDate.longitude, 0);
     let nadir = new Date(naturalDate.nadir);
@@ -69,7 +69,7 @@ export function NaturalSunEvents(naturalDate, latitude) {
     let eveningGoldenHour = naturalDate.getTimeOfEvent(SearchAltitude(Body.Sun, observer, -1, nadir, 2, +6));
     if(!eveningGoldenHour) eveningGoldenHour = isSummer ? 360 : 180;
     
-	return SUN_CACHE[cache_id] = {
+	return ASTRO_CACHE[cache_id] = {
         sunrise: sunrise,
         sunset: sunset,
         nightStart: nightStart,
@@ -117,10 +117,11 @@ export function NaturalMoonPosition(naturalDate, latitude) {
  */
 export function NaturalMoonEvents(naturalDate, latitude) {
 
-    let cache_id = naturalDate.toDateString() + latitude + naturalDate.longitude;
+    let cache_id = `MOON_${naturalDate.toDateString()}_${latitude}_${naturalDate.longitude}`;
     
-    if(MOON_CACHE?.[cache_id])
-		return MOON_CACHE[cache_id];
+    if (ASTRO_CACHE[cache_id]) {
+        return ASTRO_CACHE[cache_id];
+    }
 
     let observer = new Observer(latitude, naturalDate.longitude, 0);
 
@@ -128,8 +129,35 @@ export function NaturalMoonEvents(naturalDate, latitude) {
 	let moonrise = SearchRiseSet(Body.Moon, observer, +1, new Date(naturalDate.nadir), 1);
     let moonset = SearchRiseSet(Body.Moon, observer, -1, new Date(naturalDate.nadir), 1);
 
-    return MOON_CACHE[cache_id] = {
+    return ASTRO_CACHE[cache_id] = {
         moonrise: naturalDate.getTimeOfEvent(moonrise),
         moonset: naturalDate.getTimeOfEvent(moonset),
     }
+}
+
+/**
+ * MUSTACHES RANGE
+ * 
+ * The mustaches represents the shortest and longest day/night length
+ * @param {Number} latitude
+ * @returns Object { winterSunrise, winterSunset, summerSunrise, summerSunset }
+ */
+export function MustachesRange(naturalDate, latitude) {
+    let cache_id = `MUSTACHES_${naturalDate.year}_${latitude}`;
+    
+    if (ASTRO_CACHE[cache_id]) {
+        return ASTRO_CACHE[cache_id];
+    }
+
+    // Get the solstices for the current year
+    const currentSeasons = Seasons(new Date(naturalDate.unixTime).getFullYear());
+    let winterSolsticeSunEvents = NaturalSunEvents(new NaturalDate(currentSeasons.dec_solstice.date, 0), latitude);
+    let summerSolsticeSunEvents = NaturalSunEvents(new NaturalDate(currentSeasons.jun_solstice.date, 0), latitude);
+
+    return ASTRO_CACHE[cache_id] = {
+        winterSunrise: winterSolsticeSunEvents.sunrise,
+        winterSunset: winterSolsticeSunEvents.sunset,
+        summerSunrise: summerSolsticeSunEvents.sunrise,
+        summerSunset: summerSolsticeSunEvents.sunset,
+    };
 }

package/index.js

@@ -1,4 +1,4 @@
-import { Seasons } from 'astronomy-engine/astronomy';
+import { Seasons } from 'astronomy-engine';
 
 const NT_CACHE = {};
 
@@ -188,7 +188,7 @@ export class NaturalDate {
 	 * @returns ex: "NT+95.4" "NT-78"
 	 */
 	toLongitudeString(decimals = 1) {
-		if(this.longitude == 0)
+		if(Math.abs(Math.round(this.longitude)) == 0)
 			return "NTZ"
 			
 		return "NT" + (this.longitude > 0 ? "+" : "") + this.longitude.toFixed(decimals) + "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "natural-time-js",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Natural time is a fresh, elegant, and coherent way of measuring the movements of time here on the Earth. This new time standard is based on common sense and the observation of natural cycles. Learn more: https://naturaltime.app. This JavaScript Class translates gregorian artificial datetime to natural datetime",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,8 @@
     "Time",
     "Nature",
     "Earth",
-    "Date"
+    "Date",
+    "Natural Time"
   ],
   "author": "Sylvain 441",
   "license": "CC0-1.0",
@@ -23,6 +24,6 @@
   },
   "homepage": "https://github.com/sylvain441/natural-time-js#readme",
   "dependencies": {
-    "astronomy-engine": "^2.1.0"
+    "astronomy-engine": "^2.1.19"
   }
 }