add fields for sunRiseMinSinceMidnight and sunSetMinSinceMidnight, to…

… allow for meaningful graphs of sunrise and sunset times
concord-consortium · Aug 12, 2024 · 696525c · 696525c
1 parent 2505a0b
commit 696525c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/src/constants.ts b/src/constants.ts
@@ -89,6 +89,18 @@ export const kChildCollectionAttributes = [
     title: "Season",
     type: "categorical",
     hasToken: true
+  },
+  {
+    name: "sunriseMinSinceMidnight",
+    title: "Sunrise Minutes Since Midnight",
+    type: "numeric",
+    hasToken: true
+  },
+  {
+    name: "sunsetMinSinceMidnight",
+    title: "Sunset Minutes Since Midnight",
+    type: "numeric",
+    hasToken: true
   }
 ];
 

diff --git a/src/hooks/useCodapData.ts b/src/hooks/useCodapData.ts
@@ -73,7 +73,9 @@ export const useCodapData = () => {
           dayLength: solarEvent.dayLength,
           season: solarEvent.season,
           sunlightAngle: solarEvent.sunlightAngle,
-          solarIntensity: solarEvent.solarIntensity
+          solarIntensity: solarEvent.solarIntensity,
+          sunriseMinSinceMidnight: solarEvent.sunriseMinSinceMidnight,
+          sunsetMinSinceMidnight: solarEvent.sunsetMinSinceMidnight
         };
 
         return record;

diff --git a/src/types.ts b/src/types.ts
@@ -20,6 +20,8 @@ export interface DaylightInfo {
   season: string;
   sunlightAngle: number;
   solarIntensity: number;
+  sunriseMinSinceMidnight: number;
+  sunsetMinSinceMidnight: number;
 }
 
 export interface GeoNameSearchOptions {

diff --git a/src/utils/daylight-utils.ts b/src/utils/daylight-utils.ts
@@ -81,6 +81,10 @@ export function getSunrayAngleInDegrees(dayNum: number, earthTilt: number, lat:n
   return degrees;
 }
 
+export function getMinutesSinceMidnight(time: Dayjs): number {
+  return time.hour() * 60 + time.minute();
+}
+
 export function getDayLightInfo(options: DaylightCalcOptions): DaylightInfo[] {
   const { latitude, longitude, year } = options;
   const results: DaylightInfo[] = [];
@@ -109,8 +113,11 @@ export function getDayLightInfo(options: DaylightCalcOptions): DaylightInfo[] {
       dayAsInteger: currentDay.dayOfYear(),
       season: getSeasonName(currentDay, latitude),
       sunlightAngle: getSunrayAngleInDegrees(currentDay.dayOfYear(), kEarthTilt, latitude),
-      solarIntensity: getSolarNoonIntensity(currentDay.dayOfYear(), latitude)
+      solarIntensity: getSolarNoonIntensity(currentDay.dayOfYear(), latitude),
+      sunriseMinSinceMidnight: getMinutesSinceMidnight(localSunrise),
+      sunsetMinSinceMidnight: getMinutesSinceMidnight(localSunset)
     };
+    console.log("| record: ", record);
     results.push(record);
     currentDay = currentDay.add(1, "day");
   }