Skip to content

Commit 0f4af3b

Browse files
committed
Fixes #131: added isTransitValid into RiseSetTransit result
1 parent 8e51dc7 commit 0f4af3b

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

Sources/AABridge/KPCAARiseTransitSet.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ KPCAARiseTransitSetDetails KPCAARiseTransitSet_Calculate(double JD,
2525
KPCAARiseTransitSetDetails details;
2626
details.isRiseValid = detailsPlus.bRiseValid;
2727
details.Rise = detailsPlus.Rise;
28+
details.isTransitValid = detailsPlus.bTransitValid;
2829
details.isTransitAboveHorizon = detailsPlus.bTransitAboveHorizon;
2930
details.Transit = detailsPlus.Transit;
3031
details.isSetValid = detailsPlus.bSetValid;

Sources/AABridge/include/KPCAARiseTransitSet.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ extern "C" {
1515
typedef struct KPCAARiseTransitSetDetails {
1616
bool isRiseValid;
1717
double Rise;
18+
bool isTransitValid;
1819
bool isTransitAboveHorizon;
1920
double Transit;
2021
bool isSetValid;

Sources/SwiftAA/RiseTransitSet.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import AABridge
1313
public struct RiseTransitSetTimesDetails {
1414
public private(set) var isRiseValid: Bool
1515
public private(set) var riseTime: JulianDay
16+
public private(set) var isTransitValid: Bool
1617
public private(set) var isTransitAboveHorizon: Bool
1718
public private(set) var transitTime: JulianDay
1819
public private(set) var isSetValid: Bool
@@ -108,6 +109,7 @@ public func riseTransitSet(forJulianDay julianDay: JulianDay,
108109

109110
return RiseTransitSetTimesDetails(isRiseValid: details.isRiseValid,
110111
riseTime: rise,
112+
isTransitValid: details.isTransitValid,
111113
isTransitAboveHorizon: details.isTransitAboveHorizon,
112114
transitTime: transit,
113115
isSetValid: details.isSetValid,
@@ -186,7 +188,7 @@ public struct RiseTransitSetTimes {
186188

187189
/// The transit time of the celestial body, in Julian Day.
188190
public var transitTime: JulianDay? {
189-
get { return (self.details != nil && self.details!.isTransitAboveHorizon) ? self.details!.transitTime : nil }
191+
get { return (self.details != nil && self.details!.isTransitValid) ? self.details!.transitTime : nil }
190192
}
191193

192194
/// The set time of the celestial body, in Julian Day.

0 commit comments

Comments
 (0)