fix-wrong-solar-midnight (#53)

Co-authored-by: Nicolas Mariniello <nmariniello.dev@icloud.com>
Sunlitt · Jun 23, 2024 · 086d345 · 086d345
1 parent e9ae20c
commit 086d345
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/...ode/package.xcworkspace/xcuserdata/nmariniello.xcuserdatad/UserInterfaceState.xcuserstate b/...ode/package.xcworkspace/xcuserdata/nmariniello.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Package.swift b/Package.swift
@@ -1,12 +1,12 @@
-// swift-tools-version:5.9
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "SunKit",
     platforms: [
-        .iOS(.v14), .macOS(.v10_15), .tvOS(.v9), .watchOS(.v6)
+        .iOS(.v14), .macOS(.v10_15), .tvOS(.v12), .watchOS(.v6)
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.

diff --git a/Sources/SunKit/Sun.swift b/Sources/SunKit/Sun.swift
@@ -600,9 +600,7 @@ public struct Sun: Identifiable, Sendable {
         let secondsForSolarNoon    = secondsForUTCSolarNoon + Double(timeZoneInSeconds)
         let startOfTheDay          = calendar.startOfDay(for: date)
 
-        let hoursMinutesSeconds: (Int, Int, Int) = secondsToHoursMinutesSeconds(Int(secondsForSolarNoon))
-
-        let solarNoon = calendar.date(bySettingHour: hoursMinutesSeconds.0, minute: hoursMinutesSeconds.1, second: hoursMinutesSeconds.2, of: startOfTheDay)
+        let solarNoon = calendar.date(byAdding: .second, value: Int(secondsForSolarNoon) , to: startOfTheDay)
 
         return solarNoon
     }
@@ -611,19 +609,17 @@ public struct Sun: Identifiable, Sendable {
     /// - Returns: Solar midnight time
     private func getSolarMidnight() -> Date? {
 
-        let secondsForUTCSolarMidnight = (-4 * location.coordinate.longitude - equationOfTime) * 60
-
-        var calendarUTC:Calendar = .init(identifier: .gregorian)
-        calendarUTC.timeZone = .init(secondsFromGMT: 0)!
-
-        let startOfTheDay = calendarUTC.startOfDay(for: date)
-
-        let solarMidnight = startOfTheDay.addingTimeInterval(secondsForUTCSolarMidnight)
+        let secondsForUTCSolarMidnight = (0 - 4 * location.coordinate.longitude - equationOfTime) * 60
+        let secondsForSolarMidnight    = secondsForUTCSolarMidnight + Double(timeZoneInSeconds)
+        let startOfTheDay          = calendar.startOfDay(for: date)
 
+        let solarMidnight = calendar.date(byAdding: .second, value: Int(secondsForSolarMidnight) , to: startOfTheDay)
+
         return solarMidnight
     }
 
 
+
     /// Computes the Sunrise time for self.date
     /// - Returns: Sunrise time
     private func getSunrise() -> Date? {