-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
diff --git a/public/my_favorites.php b/public/my_favorites.php
index 7bc469c..648a431 100644
--- a/public/my_favorites.php
+++ b/public/my_favorites.php
@@ -109,6 +109,20 @@ function setExclusiveFavorite(PDO $pdo, string $tableName, string $idColumn, int
}
}
+function countUserRows(PDO $pdo, string $tableName, int $userId): int
+{
+ $stmtCount = $pdo->prepare("
+ SELECT COUNT(*)
+ FROM `{$tableName}`
+ WHERE `user_id` = :user_id
+ ");
+ $stmtCount->execute([
+ ':user_id' => $userId,
+ ]);
+
+ return (int) $stmtCount->fetchColumn();
+}
+
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$action = $_POST['action'] ?? '';
@@ -168,17 +182,89 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
if (empty($errors)) {
- $stmtDelete = $pdo->prepare("
- DELETE FROM `app_user_satellites`
+ $stmtSatellite = $pdo->prepare("
+ SELECT `satellite_id`, `is_favorite`
+ FROM `app_user_satellites`
WHERE `user_id` = :user_id
AND `satellite_id` = :satellite_id
+ LIMIT 1
");
- $stmtDelete->execute([
+ $stmtSatellite->execute([
':user_id' => $userId,
':satellite_id' => $satelliteId,
]);
+ $satelliteRow = $stmtSatellite->fetch();
- $successMessage = 'Der Satellit wurde entfernt.';
+ if (!$satelliteRow) {
+ $errors[] = 'Der Satellit ist nicht in deiner Liste vorhanden.';
+ }
+ }
+
+ if (empty($errors)) {
+ $satelliteCount = countUserRows($pdo, 'app_user_satellites', $userId);
+ if ($satelliteCount <= 1) {
+ $errors[] = 'Der letzte Satellit kann nicht geloescht werden.';
+ }
+ }
+
+ if (empty($errors)) {
+ $pdo->beginTransaction();
+
+ try {
+ $stmtDelete = $pdo->prepare("
+ DELETE FROM `app_user_satellites`
+ WHERE `user_id` = :user_id
+ AND `satellite_id` = :satellite_id
+ ");
+ $stmtDelete->execute([
+ ':user_id' => $userId,
+ ':satellite_id' => $satelliteId,
+ ]);
+
+ if ((int) ($satelliteRow['is_favorite'] ?? 0) === 1) {
+ $stmtNextFavorite = $pdo->prepare("
+ SELECT `satellite_id`
+ FROM `app_user_satellites`
+ WHERE `user_id` = :user_id
+ ORDER BY `created_at` ASC, `satellite_id` ASC
+ LIMIT 1
+ ");
+ $stmtNextFavorite->execute([
+ ':user_id' => $userId,
+ ]);
+ $nextSatelliteId = $stmtNextFavorite->fetchColumn();
+
+ if ($nextSatelliteId !== false) {
+ $stmtResetFavorites = $pdo->prepare("
+ UPDATE `app_user_satellites`
+ SET `is_favorite` = 0
+ WHERE `user_id` = :user_id
+ ");
+ $stmtResetFavorites->execute([
+ ':user_id' => $userId,
+ ]);
+
+ $stmtSetFavorite = $pdo->prepare("
+ UPDATE `app_user_satellites`
+ SET `is_favorite` = 1
+ WHERE `user_id` = :user_id
+ AND `satellite_id` = :satellite_id
+ ");
+ $stmtSetFavorite->execute([
+ ':user_id' => $userId,
+ ':satellite_id' => (int) $nextSatelliteId,
+ ]);
+ }
+ }
+
+ $pdo->commit();
+ $successMessage = 'Der Satellit wurde entfernt.';
+ } catch (Throwable $e) {
+ if ($pdo->inTransaction()) {
+ $pdo->rollBack();
+ }
+ $errors[] = 'Der Satellit konnte nicht entfernt werden.';
+ }
}
}
@@ -189,6 +275,32 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$errors[] = 'Ungueltiger Satellit.';
}
+ if (empty($errors)) {
+ $stmtCurrentSatellite = $pdo->prepare("
+ SELECT `is_favorite`
+ FROM `app_user_satellites`
+ WHERE `user_id` = :user_id
+ AND `satellite_id` = :satellite_id
+ LIMIT 1
+ ");
+ $stmtCurrentSatellite->execute([
+ ':user_id' => $userId,
+ ':satellite_id' => $satelliteId,
+ ]);
+ $currentSatelliteFavorite = $stmtCurrentSatellite->fetchColumn();
+
+ if ($currentSatelliteFavorite === false) {
+ $errors[] = 'Der Satellit ist nicht in deiner Liste vorhanden.';
+ }
+ }
+
+ if (empty($errors)) {
+ $satelliteCount = countUserRows($pdo, 'app_user_satellites', $userId);
+ if ($satelliteCount <= 1 && (int) $currentSatelliteFavorite === 1) {
+ $errors[] = 'Beim letzten Satelliten kann der Favorit nicht entfernt werden.';
+ }
+ }
+
if (empty($errors)) {
if (!setExclusiveFavorite($pdo, 'app_user_satellites', 'satellite_id', $userId, $satelliteId)) {
$errors[] = 'Der Satellit ist nicht in deiner Liste vorhanden.';
@@ -450,17 +562,89 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
if (empty($errors)) {
- $stmtDelete = $pdo->prepare("
- DELETE FROM `app_user_locations`
+ $stmtLocation = $pdo->prepare("
+ SELECT `id`, `is_default`
+ FROM `app_user_locations`
WHERE `id` = :id
AND `user_id` = :user_id
+ LIMIT 1
");
- $stmtDelete->execute([
+ $stmtLocation->execute([
':id' => $locationId,
':user_id' => $userId,
]);
+ $locationRow = $stmtLocation->fetch();
- $successMessage = 'Der Standort wurde geloescht.';
+ if (!$locationRow) {
+ $errors[] = 'Der Standort wurde nicht gefunden.';
+ }
+ }
+
+ if (empty($errors)) {
+ $locationCount = countUserRows($pdo, 'app_user_locations', $userId);
+ if ($locationCount <= 1) {
+ $errors[] = 'Der letzte Standort kann nicht geloescht werden.';
+ }
+ }
+
+ if (empty($errors)) {
+ $pdo->beginTransaction();
+
+ try {
+ $stmtDelete = $pdo->prepare("
+ DELETE FROM `app_user_locations`
+ WHERE `id` = :id
+ AND `user_id` = :user_id
+ ");
+ $stmtDelete->execute([
+ ':id' => $locationId,
+ ':user_id' => $userId,
+ ]);
+
+ if ((int) ($locationRow['is_default'] ?? 0) === 1) {
+ $stmtNextDefault = $pdo->prepare("
+ SELECT `id`
+ FROM `app_user_locations`
+ WHERE `user_id` = :user_id
+ ORDER BY `name` ASC, `id` ASC
+ LIMIT 1
+ ");
+ $stmtNextDefault->execute([
+ ':user_id' => $userId,
+ ]);
+ $nextLocationId = $stmtNextDefault->fetchColumn();
+
+ if ($nextLocationId !== false) {
+ $stmtResetDefaults = $pdo->prepare("
+ UPDATE `app_user_locations`
+ SET `is_default` = 0
+ WHERE `user_id` = :user_id
+ ");
+ $stmtResetDefaults->execute([
+ ':user_id' => $userId,
+ ]);
+
+ $stmtSetDefault = $pdo->prepare("
+ UPDATE `app_user_locations`
+ SET `is_default` = 1
+ WHERE `user_id` = :user_id
+ AND `id` = :id
+ ");
+ $stmtSetDefault->execute([
+ ':user_id' => $userId,
+ ':id' => (int) $nextLocationId,
+ ]);
+ }
+ }
+
+ $pdo->commit();
+ $successMessage = 'Der Standort wurde geloescht.';
+ } catch (Throwable $e) {
+ if ($pdo->inTransaction()) {
+ $pdo->rollBack();
+ }
+ $errors[] = 'Der Standort konnte nicht geloescht werden.';
+ }
}
}
}
@@ -697,11 +881,15 @@ $loggedIn = true;
-
+ 1): ?>
+
+
+ Letzter Standort
+
@@ -893,18 +1081,26 @@ $loggedIn = true;
-
-
+
+ Favorit bleibt gesetzt
+
+
+
+ 1): ?>
+
+
+ Letzter Satellit
+
diff --git a/public/py/__pycache__/api.cpython-312.pyc b/public/py/__pycache__/api.cpython-312.pyc
index ea68f3d..3deeb87 100644
Binary files a/public/py/__pycache__/api.cpython-312.pyc and b/public/py/__pycache__/api.cpython-312.pyc differ
diff --git a/public/py/api.py b/public/py/api.py
index a60e11f..02d60fb 100644
--- a/public/py/api.py
+++ b/public/py/api.py
@@ -93,6 +93,117 @@ def serialize_event(label: str, event_time: astronomy.Time | None, tz: ZoneInfo)
}
+def normalize_longitude_deg(value: float) -> float:
+ value = math.fmod(value, 360.0)
+ if value < 0.0:
+ value += 360.0
+ return value
+
+
+def action_solar_longitude_to_datetime(args: list[str]) -> dict:
+ if len(args) != 3:
+ fail(
+ "Aktion solar_longitude_to_datetime erwartet 3 Argumente: lambda_target_deg year timezone",
+ extra={"argv": args},
+ )
+
+ lambda_target_deg = parse_float(args[0], "Solare Laenge")
+ lambda_target_deg = normalize_longitude_deg(lambda_target_deg)
+
+ try:
+ year = int(args[1])
+ except ValueError as exc:
+ fail("Jahr ist ungueltig.", extra={"details": str(exc), "argv": args})
+
+ timezone_name = args[2]
+ try:
+ tz = ZoneInfo(timezone_name)
+ except Exception as exc: # pragma: no cover
+ fail("Zeitzone ist ungueltig oder auf dem Server nicht verfuegbar.", extra={"details": str(exc)})
+
+ start_dt_utc = datetime(year, 1, 1, 0, 0, 0, tzinfo=timezone.utc)
+ start_time = dt_to_time(start_dt_utc)
+ lambda0_deg = float(astronomy.SunPosition(start_time).elon)
+ delta_lambda_deg = normalize_longitude_deg(lambda_target_deg - lambda0_deg)
+ delta_t_days = delta_lambda_deg / 0.98564736
+
+ estimated_dt_utc = start_dt_utc + timedelta(days=delta_t_days)
+ search_start_dt_utc = estimated_dt_utc - timedelta(days=5)
+ search_start_time = dt_to_time(search_start_dt_utc)
+ result_time = astronomy.SearchSunLongitude(lambda_target_deg, search_start_time, 10.0)
+
+ if result_time is None:
+ fail(
+ "Kein Zeitpunkt fuer die angegebene solare Laenge gefunden.",
+ extra={
+ "lambda_target_deg": lambda_target_deg,
+ "year": year,
+ "timezone": timezone_name,
+ },
+ )
+
+ utc_dt = time_to_datetime(result_time)
+ local_dt = utc_dt.astimezone(tz)
+
+ return {
+ "ok": True,
+ "action": "solar_longitude_to_datetime",
+ "input": {
+ "lambda_target_deg": lambda_target_deg,
+ "year": year,
+ "timezone": timezone_name,
+ },
+ "reference": {
+ "utc_iso": start_dt_utc.isoformat().replace("+00:00", "Z"),
+ "lambda0_deg": lambda0_deg,
+ },
+ "estimate": {
+ "delta_lambda_deg": delta_lambda_deg,
+ "delta_t_days": delta_t_days,
+ "estimated_utc_iso": estimated_dt_utc.isoformat().replace("+00:00", "Z"),
+ },
+ "result": {
+ "utc_iso": utc_dt.isoformat().replace("+00:00", "Z"),
+ "local_iso": local_dt.isoformat(),
+ "local_date": local_dt.strftime("%Y-%m-%d"),
+ "local_time": local_dt.strftime("%H:%M:%S"),
+ "jd_tt": float(result_time.tt) + 2451545.0,
+ "jd_ut": float(result_time.ut) + 2451545.0,
+ },
+ }
+
+
+def action_current_solar_longitude(args: list[str]) -> dict:
+ if len(args) != 1:
+ fail(
+ "Aktion current_solar_longitude erwartet 1 Argument: timezone",
+ extra={"argv": args},
+ )
+
+ timezone_name = args[0]
+ try:
+ tz = ZoneInfo(timezone_name)
+ except Exception as exc: # pragma: no cover
+ fail("Zeitzone ist ungueltig oder auf dem Server nicht verfuegbar.", extra={"details": str(exc)})
+
+ utc_dt = datetime.now(timezone.utc)
+ time_value = dt_to_time(utc_dt)
+ solar_longitude_deg = float(astronomy.SunPosition(time_value).elon)
+ local_dt = utc_dt.astimezone(tz)
+
+ return {
+ "ok": True,
+ "action": "current_solar_longitude",
+ "result": {
+ "solar_longitude_deg": solar_longitude_deg,
+ "utc_iso": utc_dt.isoformat().replace("+00:00", "Z"),
+ "local_iso": local_dt.isoformat(),
+ "local_date": local_dt.strftime("%Y-%m-%d"),
+ "local_time": local_dt.strftime("%H:%M:%S"),
+ },
+ }
+
+
def search_event(
body: astronomy.Body,
direction: astronomy.Direction,
@@ -4014,7 +4125,7 @@ def action_satellite_passes(args: list[str]) -> dict:
def main() -> None:
if len(sys.argv) < 2:
- fail("Es wurde keine Aktion uebergeben.", extra={"available_actions": ["sun_moon_rise_set", "moon_star_occultations", "moon_phase_details", "satellite_passes", "planet_rise_set", "month_sky_context", "moon_phases_for_month", "golden_handle_for_month", "season_changes_for_month", "time_changes_for_month", "moon_planet_approaches", "moon_deep_sky_approaches_for_month", "planet_bright_star_approaches_for_month", "planet_conjunctions_for_month", "eclipses_for_month", "moon_apsides_for_month", "sun_apsides_for_month", "inner_planet_elongations_for_month", "venus_peak_magnitude_for_month", "outer_planet_events_for_month", "outer_planet_stations_for_month", "jupiter_moons_one_side_for_month", "mercury_good_visibility_for_month", "planet_parades_for_month", "planet_constellation_changes_for_month", "moon_star_occultations_for_month"]})
+ fail("Es wurde keine Aktion uebergeben.", extra={"available_actions": ["sun_moon_rise_set", "solar_longitude_to_datetime", "current_solar_longitude", "moon_star_occultations", "moon_phase_details", "satellite_passes", "planet_rise_set", "month_sky_context", "moon_phases_for_month", "golden_handle_for_month", "season_changes_for_month", "time_changes_for_month", "moon_planet_approaches", "moon_deep_sky_approaches_for_month", "planet_bright_star_approaches_for_month", "planet_conjunctions_for_month", "eclipses_for_month", "moon_apsides_for_month", "sun_apsides_for_month", "inner_planet_elongations_for_month", "venus_peak_magnitude_for_month", "outer_planet_events_for_month", "outer_planet_stations_for_month", "jupiter_moons_one_side_for_month", "mercury_good_visibility_for_month", "planet_parades_for_month", "planet_constellation_changes_for_month", "moon_star_occultations_for_month"]})
action = sys.argv[1]
args = sys.argv[2:]
@@ -4024,6 +4135,16 @@ def main() -> None:
print(json.dumps(result, ensure_ascii=True))
return
+ if action == "solar_longitude_to_datetime":
+ result = action_solar_longitude_to_datetime(args)
+ print(json.dumps(result, ensure_ascii=True))
+ return
+
+ if action == "current_solar_longitude":
+ result = action_current_solar_longitude(args)
+ print(json.dumps(result, ensure_ascii=True))
+ return
+
if action == "moon_star_occultations":
result = action_moon_star_occultations(args)
print(json.dumps(result, ensure_ascii=True))
@@ -4149,7 +4270,7 @@ def main() -> None:
print(json.dumps(result, ensure_ascii=True))
return
- fail("Unbekannte Aktion.", extra={"action": action, "available_actions": ["sun_moon_rise_set", "moon_star_occultations", "moon_phase_details", "satellite_passes", "planet_rise_set", "month_sky_context", "moon_phases_for_month", "golden_handle_for_month", "season_changes_for_month", "time_changes_for_month", "moon_planet_approaches", "moon_deep_sky_approaches_for_month", "planet_bright_star_approaches_for_month", "planet_conjunctions_for_month", "eclipses_for_month", "moon_apsides_for_month", "sun_apsides_for_month", "inner_planet_elongations_for_month", "venus_peak_magnitude_for_month", "outer_planet_events_for_month", "outer_planet_stations_for_month", "jupiter_moons_one_side_for_month", "mercury_good_visibility_for_month", "planet_parades_for_month", "planet_constellation_changes_for_month", "moon_star_occultations_for_month"]})
+ fail("Unbekannte Aktion.", extra={"action": action, "available_actions": ["sun_moon_rise_set", "solar_longitude_to_datetime", "current_solar_longitude", "moon_star_occultations", "moon_phase_details", "satellite_passes", "planet_rise_set", "month_sky_context", "moon_phases_for_month", "golden_handle_for_month", "season_changes_for_month", "time_changes_for_month", "moon_planet_approaches", "moon_deep_sky_approaches_for_month", "planet_bright_star_approaches_for_month", "planet_conjunctions_for_month", "eclipses_for_month", "moon_apsides_for_month", "sun_apsides_for_month", "inner_planet_elongations_for_month", "venus_peak_magnitude_for_month", "outer_planet_events_for_month", "outer_planet_stations_for_month", "jupiter_moons_one_side_for_month", "mercury_good_visibility_for_month", "planet_parades_for_month", "planet_constellation_changes_for_month", "moon_star_occultations_for_month"]})
if __name__ == "__main__":
-
-
-
-
- Zenitprojektion
-- , - -
-
-
-
-
-
-
-
-
-
-
- Südhimmel
-- , - -
-
-
-
-
-
-
-
-
-
-
- Mondphasen Im
-Eine Monatszeile vom ersten bis zum letzten Tag mit der Mondtextur aus moon4geocron.png.
-
-
-
-
- ![Mondphasen des Monats in einer Zeile]()
-
-
-
-
-
+
-
- Ereignisse
-Chronologische Monatsliste fuer
-
-
-
-
-
-
-
-
- Liste der Meteorstroeme
+Die Gradangaben in Aktivitaet und Maximum sind Werte der solaren Laenge. Zusaetzlich wird dafuer ein Kalenderdatum im Jahr angezeigt.
+ +Keine Meteorstroeme fuer diese Auswahl gefunden.
+ +
+
+
+
+
+
| Status | +Code | +IAU | +Bezeichnung | +ZHR | +Aktivitaet (solare Laenge) | +Maximum (solare Laenge) | +Radiant | +vg | +Mutterkoerper | +
|---|---|---|---|---|---|---|---|---|---|
| + + Aktiv + + Inaktiv + + | ++ | + |
+
+
+ mit Jahresvarianten + + |
+ + + | ++ + bis + + | ++ |
+ RA + Dec + |
+ + | + |