Commit `78a9ae10fc`

78a9ae10fc8f1c22013a9c5b7977d7895cd569ed

parent: 77668688ab

Unsigned

cmc <hello@cleberg.net> · 2026-10-20 01:43 UTC

Fix launch Live Activity expiry, meteor shower Moon, Org properties (!60)

- **Launch Live Activity**: a launch more than an hour out now gets a scheduled activity (iOS 26 `request(…, start:)`) that starts at T−60 min, so the 8-hour limit no longer ends it before liftoff. Closer launches still start immediately. Following, relaunch detection and unfollow work for the pending activity (checked in the iOS 26.5 simulator).
- **Meteor showers**: Moon illumination is computed at the observer's local solar midnight after the peak date instead of 12:00 UTC, and the detail says whether the Moon is below the horizon, up all through, sets or rises during the dark hours (Sun below −18°).
- **Observing log**: `Observation` and `Equipment` keep unknown Org properties in file order and write them back after the known ones. Timestamp format unchanged.

Tests: `swift test` (91 tests, new tests for the meteor Moon text and both property round-trips), server `node --test` (18). `AccessibilityAuditTests` fails the same way on main: it taps a "Settings" button the Sky screen no longer has.

Layout: unified · split

App/Sources/LaunchesScreen.swift +11 −2

         }
         let attributes = LaunchActivityAttributes(launchID: launch.id, rocket: launch.rocket, mission: launch.mission ?? launch.name, location: launch.location)
         let state = LaunchActivityAttributes.ContentState(net: launch.net, status: launch.status)
+        let content = ActivityContent(state: state, staleDate: launch.net.addingTimeInterval(3600))
+        // Live Activities end after 8 hours, so one for a later launch starts an hour before it.
+        let start = launch.net.addingTimeInterval(-3600)
         do {
-            _ = try Activity.request(attributes: attributes, content: .init(state: state, staleDate: launch.net.addingTimeInterval(3600)))
+            if start > .now {
+                let alert = AlertConfiguration(title: "\(attributes.rocket) launches in an hour", body: "\(attributes.mission)", sound: .default)
+                _ = try Activity.request(attributes: attributes, content: content, style: .standard, alertConfiguration: alert, start: start)
+                message = "Countdown will appear on the Lock Screen an hour before launch."
+            } else {
+                _ = try Activity.request(attributes: attributes, content: content)
+                message = "Countdown added to the Lock Screen."
+            }
             following = true
-            message = "Countdown added to the Lock Screen."
         } catch {
             message = "Couldn't start the countdown: \(error.localizedDescription)"
         }

Packages/MoonriseKit/Sources/ObservingLog/Equipment.swift +13 −4

     public var notes: String
     /// Retired items stay in the inventory for old entries but leave the picker.
     public var retired: Bool
+    /// Properties added by hand, in file order.
+    public var otherProperties: [OrgProperty]
-    public init(id: String = UUID().uuidString, kind: Kind, name: String, aperture: Double? = nil, focalLength: Double? = nil, magnification: Double? = nil, fieldOfView: Double? = nil, sensor: String = "", notes: String = "", retired: Bool = false) {
+    static let knownKeys: Set = [":ID:", ":TYPE:", ":APERTURE:", ":FOCAL_LENGTH:", ":FOCAL_RATIO:", ":MAGNIFICATION:", ":FIELD_OF_VIEW:", ":SENSOR:", ":RETIRED:"]
+    public init(id: String = UUID().uuidString, kind: Kind, name: String, aperture: Double? = nil, focalLength: Double? = nil, magnification: Double? = nil, fieldOfView: Double? = nil, sensor: String = "", notes: String = "", retired: Bool = false, otherProperties: [OrgProperty] = []) {
         self.id = id
         self.kind = kind
         self.name = name
         self.sensor = sensor
         self.notes = notes
         self.retired = retired
+        self.otherProperties = otherProperties
     }
     /// Focal length over aperture, when both are known.
         if retired { props.append((":RETIRED:", "t")) }
         var lines = ["* \(name)", ":PROPERTIES:"]
         lines += props.map { "\($0.0) \($0.1)" }
+        lines += otherProperties.map(\.line)
         lines.append(":END:")
         let body = notes.trimmingCharacters(in: .whitespacesAndNewlines)
         if !body.isEmpty { lines += ["", body] }
         let lines = text.components(separatedBy: "\n")
         guard let head = lines.first, head.hasPrefix("* ") else { return nil }
         var props: [String: String] = [:]
+        var other: [OrgProperty] = []
         var i = 1
         if i < lines.count, lines[i] == ":PROPERTIES:" {
             i += 1
             while i < lines.count, lines[i] != ":END:" {
-                let parts = lines[i].split(separator: " ", maxSplits: 1).map(String.init)
+                if let p = OrgProperty.parse(lines[i]) {
-                if parts.count == 2 { props[parts[0]] = parts[1] }
+                    if !Self.knownKeys.contains(p.key) { other.append(p) } else if !p.value.isEmpty { props[p.key] = p.value }
+                }
                 i += 1
             }
             i += 1
             fieldOfView: leadingNumber(":FIELD_OF_VIEW:"),
             sensor: props[":SENSOR:"] ?? "",
             notes: lines.dropFirst(i).joined(separator: "\n").trimmingCharacters(in: .whitespacesAndNewlines),
-            retired: props[":RETIRED:"] == "t"
+            retired: props[":RETIRED:"] == "t",
+            otherProperties: other
         )
     }
 }

Packages/MoonriseKit/Sources/ObservingLog/Observation.swift +34 −4

 import Foundation
+/// A property-drawer entry the app does not use, kept so saving does not drop it.
+public struct OrgProperty: Sendable, Equatable, Hashable {
+    /// With colons, e.g. ":TRANSPARENCY:".
+    public var key: String
+    public var value: String
+    public init(key: String, value: String) {
+        self.key = key
+        self.value = value
+    }
+    var line: String { value.isEmpty ? key : "\(key) \(value)" }
+    /// Splits a drawer line into key and value; nil for lines that are not a property.
+    static func parse(_ line: String) -> OrgProperty? {
+        let parts = line.split(separator: " ", maxSplits: 1).map(String.init)
+        guard let key = parts.first, key.count > 2, key.hasPrefix(":"), key.hasSuffix(":") else { return nil }
+        return OrgProperty(key: key, value: parts.count == 2 ? parts[1] : "")
+    }
+}
 /// One logged observation, stored as an Org file that Emacs and orgstar can read.
 public struct Observation: Sendable, Identifiable, Equatable {
     public var id: String
     /// 1 (poor) to 5 (excellent); nil when not noted.
     public var seeing: Int?
     public var notes: String
+    /// Properties added by hand, in file order.
+    public var otherProperties: [OrgProperty]
+    static let knownKeys: Set = [":ID:", ":PLACE:", ":COORDINATES:", ":EQUIPMENT:", ":EQUIPMENT_IDS:", ":SEEING:"]
-    public init(id: String = UUID().uuidString, object: String, date: Date, place: String, latitude: Double? = nil, longitude: Double? = nil, equipment: String = "", equipmentIDs: [String] = [], seeing: Int? = nil, notes: String = "") {
+    public init(id: String = UUID().uuidString, object: String, date: Date, place: String, latitude: Double? = nil, longitude: Double? = nil, equipment: String = "", equipmentIDs: [String] = [], seeing: Int? = nil, notes: String = "", otherProperties: [OrgProperty] = []) {
         self.id = id
         self.object = object
         self.date = date
         self.equipmentIDs = equipmentIDs
         self.seeing = seeing
         self.notes = notes
+        self.otherProperties = otherProperties
     }
     static let orgDate: Date.VerbatimFormatStyle = .init(format: "\(year: .defaultDigits)-\(month: .twoDigits)-\(day: .twoDigits) \(weekday: .abbreviated) \(hour: .twoDigits(clock: .twentyFourHour, hourCycle: .zeroBased)):\(minute: .twoDigits)", locale: Locale(identifier: "en_US_POSIX"), timeZone: .current, calendar: Calendar(identifier: .gregorian))
         if let seeing { props.append((":SEEING:", "\(seeing)/5")) }
         var lines = ["* \(object)", "[\(date.formatted(Self.orgDate))]", ":PROPERTIES:"]
         lines += props.map { "\($0.0) \($0.1)" }
+        lines += otherProperties.map(\.line)
         lines.append(":END:")
         let body = notes.trimmingCharacters(in: .whitespacesAndNewlines)
         if !body.isEmpty { lines += ["", body] }
               lines.count > 1, lines[1].hasPrefix("["), lines[1].hasSuffix("]"),
               let date = try? Date(String(lines[1].dropFirst().dropLast()), strategy: Self.orgDate.parseStrategy) else { return nil }
         var props: [String: String] = [:]
+        var other: [OrgProperty] = []
         var i = 2
         if i < lines.count, lines[i] == ":PROPERTIES:" {
             i += 1
             while i < lines.count, lines[i] != ":END:" {
-                let parts = lines[i].split(separator: " ", maxSplits: 1).map(String.init)
+                if let p = OrgProperty.parse(lines[i]) {
-                if parts.count == 2 { props[parts[0]] = parts[1] }
+                    if !Self.knownKeys.contains(p.key) { other.append(p) } else if !p.value.isEmpty { props[p.key] = p.value }
+                }
                 i += 1
             }
             i += 1
             equipment: props[":EQUIPMENT:"] ?? "",
             equipmentIDs: props[":EQUIPMENT_IDS:"]?.split(separator: " ").map(String.init) ?? [],
             seeing: props[":SEEING:"].flatMap { Int($0.prefix(1)) },
-            notes: notes
+            notes: notes,
+            otherProperties: other
         )
     }
 }

Packages/MoonriseKit/Sources/SkyEngine/Events.swift +17 −3

             }
         }
-        // Meteor showers, with how much moonlight there is at peak
+        // Meteor showers, with the Moon on the observer's night of the peak
+        func altitude(_ body: astro_body_t, _ d: Date) -> Double {
+            var t = time(d)
+            let eq = Astronomy_Equator(body, &t, observer.astro, EQUATOR_OF_DATE, ABERRATION)
+            return Astronomy_Horizon(&t, observer.astro, eq.ra, eq.dec, REFRACTION_NORMAL).altitude
+        }
         var utc = Calendar(identifier: .gregorian)
         utc.timeZone = TimeZone(identifier: "UTC")!
         for y in y0...(y0 + 1) {
             for m in MeteorShower.major {
                 guard let d = utc.date(from: DateComponents(year: y, month: m.month, day: m.day, hour: 12)), d >= start, d <= end else { continue }
-                let lit = Astronomy_Illumination(BODY_MOON, time(d)).phase_fraction
+                // Local solar midnight after the evening of the peak date.
-                out.append(SkyEvent(kind: .meteorShower, date: d, title: "\(m.name) peak", detail: String(format: "Up to about %d meteors an hour under dark skies. Moon %.0f%% lit.", m.zhr, lit * 100), visibleHere: nil))
+                let midnight = d.addingTimeInterval((12 - observer.longitude / 15) * 3600)
+                let lit = Astronomy_Illumination(BODY_MOON, time(midnight)).phase_fraction
+                // Dark hours: Sun below -18°, or just midnight where it never gets that dark.
+                var dark = stride(from: -12.0, through: 12.0, by: 0.25).map { midnight.addingTimeInterval($0 * 3600) }.filter { altitude(BODY_SUN, $0) < -18 }
+                if dark.isEmpty { dark = [midnight] }
+                let up = dark.map { altitude(BODY_MOON, $0) > 0 }
+                let moon = !up.contains(true) ? "below the horizon during the dark hours"
+                    : !up.contains(false) ? "up all through the dark hours"
+                    : up[0] ? "sets during the dark hours" : "rises during the dark hours"
+                out.append(SkyEvent(kind: .meteorShower, date: d, title: "\(m.name) peak", detail: String(format: "Up to about %d meteors an hour under dark skies. Moon %.0f%% lit, %@.", m.zhr, lit * 100, moon), visibleHere: nil))
             }
         }

Packages/MoonriseKit/Tests/ObservingLogTests/ObservingLogTests.swift +18

	@@ -124,3 +124,21 @@ let when = Date(timeIntervalSince1970: 1_792_202_400) // 2026-10-17T02:00:00Z
124	let none = EquipmentUsage(of: "camera", in: log, calendar: cal)	124	let none = EquipmentUsage(of: "camera", in: log, calendar: cal)
125	#expect(none.observations == 0 && none.first == nil && none.averageSeeing == nil && none.usedWith.isEmpty)	125	#expect(none.observations == 0 && none.first == nil && none.averageSeeing == nil && none.usedWith.isEmpty)
126	}	126	}
		127
		128	@Test func observationKeepsHandAddedProperties() throws {
		129	let text = "* Saturn\n[2026-10-16 Fri 21:00]\n:PROPERTIES:\n:ID: abc\n:TRANSPARENCY: 4/5\n:PLACE: Chicago\n:CATEGORY: planet\n:BORTLE:\n:END:\n\nRings.\n"
		130	var o = try #require(Observation(org: text))
		131	o.notes = "Rings and Titan."
		132	let out = o.org
		133	#expect(out.contains(":PLACE: Chicago\n:TRANSPARENCY: 4/5\n:CATEGORY: planet\n:BORTLE:\n:END:\n"))
		134	#expect(Observation(org: out) == o)
		135	}
		136
		137	@Test func equipmentKeepsHandAddedProperties() throws {
		138	let text = "* Dob\n:PROPERTIES:\n:ID: scope-1\n:TYPE: telescope\n:PURCHASED: 2019-05-02\n:APERTURE: 203 mm\n:FOCAL_RATIO: f/5.9\n:SERIAL: X123\n:END:\n"
		139	var scope = try #require(Equipment(org: text))
		140	scope.focalLength = 1200
		141	let out = scope.org
		142	#expect(out.contains(":FOCAL_RATIO: f/5.9\n:PURCHASED: 2019-05-02\n:SERIAL: X123\n:END:\n"))
		143	#expect(Equipment(org: out) == scope)
		144	}

Packages/MoonriseKit/Tests/SkyEngineTests/EventsTests.swift +11

	@@ -33,3 +33,14 @@ func utc(_ s: String) -> Date { try! Date(s, strategy: .iso8601) }
33	let kinds = Set(events.map(\.kind))	33	let kinds = Set(events.map(\.kind))
34	#expect(kinds.isSuperset(of: [.moonPhase, .lunarEclipse, .solarEclipse, .opposition, .elongation, .season, .meteorShower]))	34	#expect(kinds.isSuperset(of: [.moonPhase, .lunarEclipse, .solarEclipse, .opposition, .elongation, .season, .meteorShower]))
35	}	35	}
		36
		37	@Test func meteorShowerMoonIsForTheLocalNight() throws {
		38	let events = SkyEngine.events(from: utc("2026-08-01T00:00:00Z"), days: 180, observer: chicago)
		39	func detail(_ name: String) throws -> String { try #require(events.first { $0.title == "\(name) peak" }).detail }
		40	// New moon on 12 August 2026.
		41	#expect(try detail("Perseids").hasSuffix("Moon 0% lit, below the horizon during the dark hours."))
		42	// 76% at 12:00 UTC on the 21st; 82% at Chicago midnight, setting about 03:00 CDT.
		43	#expect(try detail("Orionids").hasSuffix("Moon 82% lit, sets during the dark hours."))
		44	// 16% at 12:00 UTC on the 3rd; 11% at Chicago midnight, rising about 05:00 CST before dawn.
		45	#expect(try detail("Quadrantids").hasSuffix("Moon 11% lit, rises during the dark hours."))
		46	}

Commit 78a9ae10fc

Commit `78a9ae10fc`