From 9aeabbacfb88bea4e9975223101bade0968904d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Itallo=20Brand=C3=A3o?= <45429643+IMBrandao@users.noreply.github.com> Date: Thu, 12 Nov 2026 01:26:29 -0300 Subject: [PATCH] feat(satellites): ISS as a 3D model up close, NASA live video when selected Within 1,500 km of the camera the ISS (NORAD 25544) is drawn as NASA 3D Resources' station model, at its real 109 m span with a 72 px floor, in its usual +XVV attitude from a per-frame SGP4 sample (the follow camera's sample while tracked). Farther out the dot stays; model and dots split the distance range. Selecting the ISS opens a panel beside the existing tracked card with NASA's official ISS live stream, embedded through youtube-nocookie with a fixed video id (no page scraping). Co-Authored-By: Claude Opus 5.5 --- DATA_SOURCES.md | 2 + docs/CURRENT-STATE.md | 11 + public/models/README.md | 1 + public/models/iss.glb | Bin 0 -> 39708 bytes scripts/package-boundaries.json | 6 + src/app/constructCatalog.js | 1 + src/app/layers/satellites.js | 7 +- src/data/dataCredits.js | 12 + src/i18n/locales/ar.json | 7 +- src/i18n/locales/de.json | 7 +- src/i18n/locales/es.json | 7 +- src/i18n/locales/fr.json | 7 +- src/i18n/locales/he.json | 7 +- src/i18n/locales/it.json | 7 +- src/i18n/locales/ja.json | 7 +- src/i18n/locales/pt.json | 7 +- src/i18n/locales/ru.json | 7 +- src/i18n/locales/sv.json | 7 +- src/i18n/locales/uk.json | 7 +- src/i18n/locales/zh-CN.json | 7 +- src/i18n/locales/zh-Hant.json | 7 +- src/i18n/same-as-english.json | 6 +- src/layers/satellites/index.js | 10 +- src/layers/satellites/interaction.js | 2 + src/layers/satellites/issLive.js | 143 ++++++++++++ src/layers/satellites/issModel.js | 281 ++++++++++++++++++++++++ src/layers/satellites/issModel.test.mjs | 151 +++++++++++++ src/layers/satellites/lifecycle.js | 5 + src/layers/satellites/policy.js | 36 +++ src/layers/satellites/rendering.js | 8 + src/ui/styles/iss-live.css | 84 +++++++ style.css | 1 + 32 files changed, 841 insertions(+), 17 deletions(-) create mode 100644 public/models/iss.glb create mode 100644 src/layers/satellites/issLive.js create mode 100644 src/layers/satellites/issModel.js create mode 100644 src/layers/satellites/issModel.test.mjs create mode 100644 src/ui/styles/iss-live.css diff --git a/DATA_SOURCES.md b/DATA_SOURCES.md index 1398e52f4c..1a5187e705 100644 --- a/DATA_SOURCES.md +++ b/DATA_SOURCES.md @@ -33,6 +33,8 @@ How to read this: | **Planespotters.net** (`api.planespotters.net/pub/photos/hex/{hex}`) | One thumbnail photo of the tracked aircraft, by ICAO hex, in the CONTEXT panel's CONTACTS view under the tracked flight's name | [Planespotters photo API terms](https://www.planespotters.net/photo/api); each photo remains the copyright of its photographer. Thumbnails may be hotlinked on the condition that the photographer is named next to the photo and the photo links to its Planespotters page with a followable link | "Photo © {photographer}" beside every photo that names one, linked to its Planespotters page; "Planespotters.net" in Data attribution | | **AISStream.io** | Live vessels (AIS) | Free, beta, no formal ToS; AIS is a public broadcast | "AISStream.io" (courtesy) | | **CelesTrak** | Satellite TLEs (SGP4) and SATCAT records (object type, operational status, owner) that file each satellite under a class | US-government-origin data, no license; citation requested | "CelesTrak (celestrak.org), Dr. T.S. Kelso" | +| **NASA 3D Resources** (`public/models/iss.glb`) | The ISS drawn as a 3D model when the camera is near it (satellites layer) | NASA media, not subject to copyright in the United States; NASA's Images and Media Usage Guidelines (https://www.nasa.gov/nasa-brand-center/images-and-media) ask that use not imply endorsement and that the insignia not be used | "ISS model: NASA 3D Resources" | +| **NASA ISS live stream on YouTube** (`youtube-nocookie.com/embed/ROboUHfPUrU`) | NASA's official live video from the ISS ("Live High-Definition Views from the International Space Station"), embedded with YouTube's player while the ISS is selected; the app stores nothing from it | NASA video, not subject to copyright in the United States (same guidelines); played through YouTube's embedded player under YouTube's Terms of Service | "ISS live video: NASA, via YouTube" | | **The Space Devs — Launch Library 2 v2.3** | Recent launch, payload, stage, and recovery metadata for Space Missions (30d) | [The Space Devs terms of use](https://github.com/TheSpaceDevs/Tutorials/blob/main/faqs/faq_TSD.md#terms-of-use): data may be used and shared in any form; avoid forwarding it without added value; attribution is encouraged (not mandatory). [Official API limits](https://ll.thespacedevs.com/docs/): 15 unauthenticated calls/hour; optional token | "Launch Library 2 — The Space Devs" (courtesy attribution) | | **Esri World Imagery** (ArcGIS Online tile service) | The keyless satellite basemap — the default landing when no Google/ion credential is configured, and the "Esri Satellite" map stack | [Esri Master Agreement](https://www.esri.com/en-us/legal/terms/full-master-agreement): the public World Imagery service is usable in public-facing apps with attribution; no key is required for this classic endpoint, but Esri governs and can change access — an app at scale should review current ArcGIS Location Platform terms | "Powered by Esri — Source: Esri, Maxar, Earthstar Geographics, and the GIS User Community" (provider carries the service's own credit line) | | **USGS** | Earthquakes | U.S. public domain | "Data courtesy of the U.S. Geological Survey" | diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md index bdfefe0436..62e52118a1 100644 --- a/docs/CURRENT-STATE.md +++ b/docs/CURRENT-STATE.md @@ -1378,6 +1378,17 @@ a fresh winning record. Dense removal clears only its own provenance, and a fresh core rebuild or lifecycle reset replaces the corresponding ownership. Source adapters retain the existing CelesTrak and Launch Library endpoints; standalone entries provide scene services and the satellite dependency. +The ISS (NORAD 25544, by number, not name) is drawn as NASA's 3D model within +1,500 km of the camera and as its dot beyond; the two split the distance range, +so exactly one draws (the tracked dot too). The model is at its real 109 m span +with a 72 px floor, flies the station's usual attitude (modules along the +velocity, the same side to the Earth) from its own per-frame SGP4 sample, sits +on the follow camera's sample while tracked, loads only once the ISS is shown, +and hides with the dot's own rules and under the Cockpit hold. A click on it +tracks the ISS. While the ISS is selected, a panel beside the tracked card plays +NASA's official ISS live stream (YouTube, muted to start); closing it holds +until the next selection, and untracking, the Cockpit or turning the layer off +removes the player. The mission factory separates paths, replay, camera, panel, overlays and placement. Launch Library pad coordinates retain unknown values: missing fields use the reported location coordinates when available, and launches without a known pad diff --git a/public/models/README.md b/public/models/README.md index aa7f40fbd9..efb22d7623 100644 --- a/public/models/README.md +++ b/public/models/README.md @@ -14,6 +14,7 @@ under the license listed below. | `mq9.glb` | “MQ-9” by [IProZenoN](https://sketchfab.com/IProZenoN) | [Sketchfab model](https://sketchfab.com/3d-models/mq-9-fabe963feb354c5584b51f9c470c3f7e) | [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) | Optimized for God's Eye View: geometry/material simplification, textures resized to 256 px WebP, orientation/scale vertex-baked to real-world meters (Y-up, nose −X), origin centered. | | `b789.glb` | “Boeing 787-9” by [Nobilis 2](https://sketchfab.com/nobilishornet2) | [Sketchfab model](https://sketchfab.com/3d-models/boeing-787-9-b6711e2e698e4e469675c1154a50b7a3) | [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) | Optimized for God's Eye View: geometry/material simplification, textures resized to 256 px WebP, orientation/scale vertex-baked to real-world meters (Y-up, nose −X), origin centered. | | `atr72.glb` | “ATR 72 - 600” by [Oyan3D](https://sketchfab.com/oyan3D) | [Sketchfab model](https://sketchfab.com/3d-models/atr-72-600-1e1a7186f7444d288675262fcee44744) | [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) | Optimized for God's Eye View: geometry/material simplification, textures removed with dominant material colors baked into PBR factors (flat “abstracted” style), orientation/scale vertex-baked to real-world meters (Y-up, nose −X), origin centered. | +| `iss.glb` | “International Space Station (ISS) (A)”, NASA | [NASA 3D Resources](https://github.com/nasa/NASA-3D-Resources/tree/master/3D%20Models/International%20Space%20Station%20(ISS)%20(A)) | NASA media: not subject to copyright in the United States ([NASA Images and Media Usage Guidelines](https://www.nasa.gov/nasa-brand-center/images-and-media)) | None: shipped as published (Draco-compressed, 40 KB). The app scales it to the real 109 m truss at runtime. Its use does not imply endorsement by NASA. | CC BY 4.0 permits sharing and adaptation, including commercial use, provided appropriate credit is retained, the license is linked, and modifications are diff --git a/public/models/iss.glb b/public/models/iss.glb new file mode 100644 index 0000000000000000000000000000000000000000..ff970bb2056230fdf180590dd5ca59544f92d18e GIT binary patch literal 39708 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 YW-VJf)h#L<$rhuH!kxhX{Y?D70ESu!`v3p{ literal 0 HcmV?d00001 diff --git a/scripts/package-boundaries.json b/scripts/package-boundaries.json index a771cc26f4..0dd3c5e10e 100644 --- a/scripts/package-boundaries.json +++ b/scripts/package-boundaries.json @@ -1790,6 +1790,8 @@ "src/layers/satellites/index.js", "src/layers/satellites/ingestion.js", "src/layers/satellites/interaction.js", + "src/layers/satellites/issModel.js", + "src/layers/satellites/issLive.js", "src/layers/satellites/labels.js", "src/layers/satellites/lifecycle.js", "src/layers/satellites/orbits.js", @@ -2904,6 +2906,8 @@ "src/layers/satellites/index.js", "src/layers/satellites/ingestion.js", "src/layers/satellites/interaction.js", + "src/layers/satellites/issModel.js", + "src/layers/satellites/issLive.js", "src/layers/satellites/labels.js", "src/layers/satellites/lifecycle.js", "src/layers/satellites/orbits.js", @@ -3941,6 +3945,8 @@ "src/layers/satellites/index.js", "src/layers/satellites/ingestion.js", "src/layers/satellites/interaction.js", + "src/layers/satellites/issModel.js", + "src/layers/satellites/issLive.js", "src/layers/satellites/labels.js", "src/layers/satellites/lifecycle.js", "src/layers/satellites/orbits.js", diff --git a/src/app/constructCatalog.js b/src/app/constructCatalog.js index c3d6c6f405..5ea9c980ba 100644 --- a/src/app/constructCatalog.js +++ b/src/app/constructCatalog.js @@ -116,6 +116,7 @@ export function createApplicationCatalog({ }); const satellites = createApplicationSatellites({ source: sources.satellites, + ...(resolveAsset ? { resolveAsset } : {}), }); const catalog = createLayerCatalog( [ diff --git a/src/app/layers/satellites.js b/src/app/layers/satellites.js index 10eccb39f2..5312005c79 100644 --- a/src/app/layers/satellites.js +++ b/src/app/layers/satellites.js @@ -8,9 +8,14 @@ import * as render from '../../renderGovernor.js'; import * as layerState from '../../data/layerState.js'; /** Construct one layer using the application scene owners and a supplied source. */ -export function createApplicationSatellites({ source }) { +export function createApplicationSatellites({ + source, + resolveAsset = (url) => + `${import.meta.env?.BASE_URL || '/'}${url.replace(/^\//, '')}`, +}) { return createSatellitesLayer({ source, + resolveAsset, services: { picking, focus, diff --git a/src/data/dataCredits.js b/src/data/dataCredits.js index a452fa0cfe..3290b50eca 100644 --- a/src/data/dataCredits.js +++ b/src/data/dataCredits.js @@ -154,6 +154,18 @@ export const DATA_CREDITS = [ '(celestrak.org), ' + 'Dr. T.S. Kelso', }, + { + key: 'nasa-iss-model', + html: + 'ISS model: ' + + 'NASA 3D Resources', + }, + { + key: 'nasa-iss-live', + html: + 'ISS live video: NASA, via ' + + 'YouTube', + }, { key: 'ucs-satellite-database', html: diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json index 76516c4e31..47d7f33372 100644 --- a/src/i18n/locales/ar.json +++ b/src/i18n/locales/ar.json @@ -3830,5 +3830,10 @@ "{source} imagery could not be opened": "تعذّر فتح صور {source}", "{place} has no position to look for imagery at": "لا يوجد لـ{place} موضع للبحث عن الصور فيه", "No {source} imagery near {place}": "لا توجد صور {source} قرب {place}", - "{reason} (filters on: {filters})": "{reason} (المرشحات المفعّلة: {filters})" + "{reason} (filters on: {filters})": "{reason} (المرشحات المفعّلة: {filters})", + "ISS live video": "بث مباشر من محطة الفضاء الدولية", + "ISS LIVE · NASA": "محطة الفضاء الدولية مباشر · NASA", + "Open on YouTube": "فتح على YouTube", + "Close ISS live video": "إغلاق البث المباشر لمحطة الفضاء الدولية", + "Live views from the International Space Station (NASA)": "مشاهد مباشرة من محطة الفضاء الدولية (NASA)" } diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json index b00084ebcc..3dbecf4515 100644 --- a/src/i18n/locales/de.json +++ b/src/i18n/locales/de.json @@ -3506,5 +3506,10 @@ "{source} imagery could not be opened": "Bilder von {source} konnten nicht geöffnet werden", "{place} has no position to look for imagery at": "{place} hat keine Position, an der nach Bildern gesucht werden kann", "No {source} imagery near {place}": "Keine Bilder von {source} in der Nähe von {place}", - "{reason} (filters on: {filters})": "{reason} (aktive Filter: {filters})" + "{reason} (filters on: {filters})": "{reason} (aktive Filter: {filters})", + "ISS live video": "ISS-Livevideo", + "ISS LIVE · NASA": "ISS LIVE · NASA", + "Open on YouTube": "Auf YouTube öffnen", + "Close ISS live video": "ISS-Livevideo schließen", + "Live views from the International Space Station (NASA)": "Livebilder von der Internationalen Raumstation (NASA)" } diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json index 525306c35d..c925be4c2e 100644 --- a/src/i18n/locales/es.json +++ b/src/i18n/locales/es.json @@ -3587,5 +3587,10 @@ "{source} imagery could not be opened": "No se pudieron abrir las imágenes de {source}", "{place} has no position to look for imagery at": "{place} no tiene una posición donde buscar imágenes", "No {source} imagery near {place}": "No hay imágenes de {source} cerca de {place}", - "{reason} (filters on: {filters})": "{reason} (filtros activos: {filters})" + "{reason} (filters on: {filters})": "{reason} (filtros activos: {filters})", + "ISS live video": "Vídeo en directo de la ISS", + "ISS LIVE · NASA": "ISS EN DIRECTO · NASA", + "Open on YouTube": "Abrir en YouTube", + "Close ISS live video": "Cerrar vídeo en directo de la ISS", + "Live views from the International Space Station (NASA)": "Imágenes en directo de la Estación Espacial Internacional (NASA)" } diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json index 7c4a54cf2a..1ca4059388 100644 --- a/src/i18n/locales/fr.json +++ b/src/i18n/locales/fr.json @@ -3587,5 +3587,10 @@ "{source} imagery could not be opened": "Impossible d'ouvrir les images de {source}", "{place} has no position to look for imagery at": "{place} n'a pas de position où chercher des images", "No {source} imagery near {place}": "Aucune image {source} près de {place}", - "{reason} (filters on: {filters})": "{reason} (filtres actifs : {filters})" + "{reason} (filters on: {filters})": "{reason} (filtres actifs : {filters})", + "ISS live video": "Vidéo en direct de l’ISS", + "ISS LIVE · NASA": "ISS EN DIRECT · NASA", + "Open on YouTube": "Ouvrir sur YouTube", + "Close ISS live video": "Fermer la vidéo en direct de l’ISS", + "Live views from the International Space Station (NASA)": "Images en direct de la Station spatiale internationale (NASA)" } diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json index c28e10ba28..bf236fa0b1 100644 --- a/src/i18n/locales/he.json +++ b/src/i18n/locales/he.json @@ -3587,5 +3587,10 @@ "{source} imagery could not be opened": "לא ניתן היה לפתוח את הצילומים של {source}", "{place} has no position to look for imagery at": "ל-{place} אין מיקום לחיפוש צילומים", "No {source} imagery near {place}": "אין צילומים של {source} ליד {place}", - "{reason} (filters on: {filters})": "{reason} (מסננים פעילים: {filters})" + "{reason} (filters on: {filters})": "{reason} (מסננים פעילים: {filters})", + "ISS live video": "שידור חי מתחנת החלל", + "ISS LIVE · NASA": "ISS בשידור חי · NASA", + "Open on YouTube": "פתיחה ב-YouTube", + "Close ISS live video": "סגירת השידור החי מתחנת החלל", + "Live views from the International Space Station (NASA)": "צילומים חיים מתחנת החלל הבינלאומית (NASA)" } diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json index 200fb17f47..b1dd5fb2f3 100644 --- a/src/i18n/locales/it.json +++ b/src/i18n/locales/it.json @@ -3587,5 +3587,10 @@ "{source} imagery could not be opened": "Impossibile aprire le immagini di {source}", "{place} has no position to look for imagery at": "{place} non ha una posizione in cui cercare immagini", "No {source} imagery near {place}": "Nessuna immagine di {source} vicino a {place}", - "{reason} (filters on: {filters})": "{reason} (filtri attivi: {filters})" + "{reason} (filters on: {filters})": "{reason} (filtri attivi: {filters})", + "ISS live video": "Video in diretta dalla ISS", + "ISS LIVE · NASA": "ISS IN DIRETTA · NASA", + "Open on YouTube": "Apri su YouTube", + "Close ISS live video": "Chiudi il video in diretta della ISS", + "Live views from the International Space Station (NASA)": "Immagini in diretta dalla Stazione Spaziale Internazionale (NASA)" } diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json index 0df76fc4e3..d804d92b48 100644 --- a/src/i18n/locales/ja.json +++ b/src/i18n/locales/ja.json @@ -3425,5 +3425,10 @@ "{source} imagery could not be opened": "{source}の画像を開けませんでした", "{place} has no position to look for imagery at": "{place}には画像を探す位置がありません", "No {source} imagery near {place}": "{place}の近くに{source}の画像はありません", - "{reason} (filters on: {filters})": "{reason}(有効なフィルター: {filters})" + "{reason} (filters on: {filters})": "{reason}(有効なフィルター: {filters})", + "ISS live video": "ISSのライブ映像", + "ISS LIVE · NASA": "ISS ライブ · NASA", + "Open on YouTube": "YouTubeで開く", + "Close ISS live video": "ISSのライブ映像を閉じる", + "Live views from the International Space Station (NASA)": "国際宇宙ステーションからのライブ映像(NASA)" } diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json index 926a02ce67..d673f7232b 100644 --- a/src/i18n/locales/pt.json +++ b/src/i18n/locales/pt.json @@ -3587,5 +3587,10 @@ "{source} imagery could not be opened": "Não foi possível abrir as imagens de {source}", "{place} has no position to look for imagery at": "{place} não tem uma posição para buscar imagens", "No {source} imagery near {place}": "Nenhuma imagem de {source} perto de {place}", - "{reason} (filters on: {filters})": "{reason} (filtros ativos: {filters})" + "{reason} (filters on: {filters})": "{reason} (filtros ativos: {filters})", + "ISS live video": "Vídeo ao vivo da ISS", + "ISS LIVE · NASA": "ISS AO VIVO · NASA", + "Open on YouTube": "Abrir no YouTube", + "Close ISS live video": "Fechar vídeo ao vivo da ISS", + "Live views from the International Space Station (NASA)": "Imagens ao vivo da Estação Espacial Internacional (NASA)" } diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json index a1ec7ad85e..1f989f0b38 100644 --- a/src/i18n/locales/ru.json +++ b/src/i18n/locales/ru.json @@ -3668,5 +3668,10 @@ "{source} imagery could not be opened": "Не удалось открыть снимки {source}", "{place} has no position to look for imagery at": "У места «{place}» нет координат для поиска снимков", "No {source} imagery near {place}": "Нет снимков {source} рядом с {place}", - "{reason} (filters on: {filters})": "{reason} (включены фильтры: {filters})" + "{reason} (filters on: {filters})": "{reason} (включены фильтры: {filters})", + "ISS live video": "Прямая трансляция с МКС", + "ISS LIVE · NASA": "МКС В ЭФИРЕ · NASA", + "Open on YouTube": "Открыть на YouTube", + "Close ISS live video": "Закрыть трансляцию с МКС", + "Live views from the International Space Station (NASA)": "Прямая трансляция с Международной космической станции (NASA)" } diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json index 73719086a5..85633e95ff 100644 --- a/src/i18n/locales/sv.json +++ b/src/i18n/locales/sv.json @@ -3506,5 +3506,10 @@ "Play speed": "Uppspelningshastighet", "Scroll or pinch to zoom, drag to move along · double-click to see it all": "Scrolla eller nyp för att zooma, dra för att flytta · dubbelklicka för att se allt", "Live": "Live", - "Back to live": "Tillbaka till live" + "Back to live": "Tillbaka till live", + "ISS live video": "Livevideo från ISS", + "ISS LIVE · NASA": "ISS LIVE · NASA", + "Open on YouTube": "Öppna på YouTube", + "Close ISS live video": "Stäng livevideon från ISS", + "Live views from the International Space Station (NASA)": "Livebilder från Internationella rymdstationen (NASA)" } diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json index f7dc9c35b6..9e6b7e9b9b 100644 --- a/src/i18n/locales/uk.json +++ b/src/i18n/locales/uk.json @@ -3668,5 +3668,10 @@ "{source} imagery could not be opened": "Не вдалося відкрити знімки {source}", "{place} has no position to look for imagery at": "Для місця «{place}» немає координат для пошуку знімків", "No {source} imagery near {place}": "Немає знімків {source} поблизу {place}", - "{reason} (filters on: {filters})": "{reason} (увімкнено фільтри: {filters})" + "{reason} (filters on: {filters})": "{reason} (увімкнено фільтри: {filters})", + "ISS live video": "Пряма трансляція з МКС", + "ISS LIVE · NASA": "МКС НАЖИВО · NASA", + "Open on YouTube": "Відкрити на YouTube", + "Close ISS live video": "Закрити трансляцію з МКС", + "Live views from the International Space Station (NASA)": "Пряма трансляція з Міжнародної космічної станції (NASA)" } diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json index 6b3020392c..976b7ce4b7 100644 --- a/src/i18n/locales/zh-CN.json +++ b/src/i18n/locales/zh-CN.json @@ -3425,5 +3425,10 @@ "{source} imagery could not be opened": "无法打开 {source} 影像", "{place} has no position to look for imagery at": "{place} 没有可查找影像的位置", "No {source} imagery near {place}": "{place} 附近没有 {source} 影像", - "{reason} (filters on: {filters})": "{reason}(已开启筛选:{filters})" + "{reason} (filters on: {filters})": "{reason}(已开启筛选:{filters})", + "ISS live video": "国际空间站直播视频", + "ISS LIVE · NASA": "国际空间站直播 · NASA", + "Open on YouTube": "在 YouTube 上打开", + "Close ISS live video": "关闭国际空间站直播视频", + "Live views from the International Space Station (NASA)": "国际空间站实时画面(NASA)" } diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json index 3bf6ada542..092eea8fd0 100644 --- a/src/i18n/locales/zh-Hant.json +++ b/src/i18n/locales/zh-Hant.json @@ -3425,5 +3425,10 @@ "{source} imagery could not be opened": "無法打開 {source} 影像", "{place} has no position to look for imagery at": "{place} 沒有可查找影像的位置", "No {source} imagery near {place}": "{place} 附近沒有 {source} 影像", - "{reason} (filters on: {filters})": "{reason}(已開啟篩選:{filters})" + "{reason} (filters on: {filters})": "{reason}(已開啟篩選:{filters})", + "ISS live video": "國際太空站直播影片", + "ISS LIVE · NASA": "國際太空站直播 · NASA", + "Open on YouTube": "在 YouTube 上開啟", + "Close ISS live video": "關閉國際太空站直播影片", + "Live views from the International Space Station (NASA)": "國際太空站即時畫面(NASA)" } diff --git a/src/i18n/same-as-english.json b/src/i18n/same-as-english.json index ed788cebcb..fc3a5d29e4 100644 --- a/src/i18n/same-as-english.json +++ b/src/i18n/same-as-english.json @@ -244,7 +244,8 @@ "▲ {frp} MW", "ICAO: {id}", "MMSI: {id}", - "NORAD: {id}" + "NORAD: {id}", + "ISS LIVE · NASA" ], "es": [ "1 min/s", @@ -1245,7 +1246,8 @@ "Period", "ICAO: {id}", "NORAD: {id}", - "MMSI: {id}" + "MMSI: {id}", + "ISS LIVE · NASA" ], "uk": [ "1900–1945", diff --git a/src/layers/satellites/index.js b/src/layers/satellites/index.js index c7e5163f43..f561505a8a 100644 --- a/src/layers/satellites/index.js +++ b/src/layers/satellites/index.js @@ -7,13 +7,19 @@ import { createRendering } from './rendering.js'; import { createTracking } from './tracking.js'; import { createTesting } from './testing.js'; import { createInteraction } from './interaction.js'; +import { createIssLive } from './issLive.js'; +import { createIssModel } from './issModel.js'; import { createLifecycle } from './lifecycle.js'; import { createIngestion } from './ingestion.js'; import { createRecords } from './records.js'; import { createState } from './state.js'; /** Construct one layer with its own scene state and supplied application services. */ -export function createSatellitesLayer({ services, source }) { +export function createSatellitesLayer({ + services, + source, + resolveAsset = (url) => url, +}) { if (typeof source?.readGroup !== 'function') throw new TypeError('A satellites source is required'); const state = createState({ services }); @@ -25,6 +31,8 @@ export function createSatellitesLayer({ services, source }) { parts.orbits = createOrbits(context); parts.records = createRecords(context); parts.rendering = createRendering(context); + parts.issModel = createIssModel({ ...context, resolveAsset }); + parts.issLive = createIssLive(context); parts.tracking = createTracking(context); parts.testing = createTesting(context); parts.interaction = createInteraction(context); diff --git a/src/layers/satellites/interaction.js b/src/layers/satellites/interaction.js index 7506500f5f..19e82e40ca 100644 --- a/src/layers/satellites/interaction.js +++ b/src/layers/satellites/interaction.js @@ -65,6 +65,8 @@ export function createInteraction({ const prim = picked.primitive; if (prim && prim.id != null) { const noradId = Number(prim.id); + // A click on the tracked ISS's own model: it is already tracked. + if (noradId === layerState._trackedNorad) return; if (!isNaN(noradId) && layerState._catalog.has(noradId)) { parts.tracking._cancelPendingTrackingRestore(); parts.tracking._trackSatellite(noradId, { origin: 'user' }); diff --git a/src/layers/satellites/issLive.js b/src/layers/satellites/issLive.js new file mode 100644 index 0000000000..a1c3fb5bf6 --- /dev/null +++ b/src/layers/satellites/issLive.js @@ -0,0 +1,143 @@ +import { t } from '../../i18n/index.js'; +import { ISS_LIVE_VIDEO_ID, ISS_NORAD } from './policy.js'; + +/** + * The player address for a YouTube video: the privacy-enhanced host the + * page's frame-src allows, muted so the browser lets it start on its own. + * @param {string} videoId + * @returns {string} + */ +export function issLiveEmbedUrl(videoId) { + const params = new URLSearchParams({ + autoplay: '1', + mute: '1', + playsinline: '1', + rel: '0', + }); + return `https://www.youtube-nocookie.com/embed/${encodeURIComponent(videoId)}?${params}`; +} + +/** The video's own page, for the "Open on YouTube" link. */ +export function issLiveWatchUrl(videoId) { + return `https://www.youtube.com/watch?v=${encodeURIComponent(videoId)}`; +} + +/** + * Whether the live panel shows: the ISS selected (tracked), the layer on, the + * Cockpit not riding it, and the viewer not having closed it for this pick. + * @param {{enabled: boolean, trackedNorad: number|null, cockpitHeld: boolean, + * dismissed: boolean}} input + * @returns {boolean} + */ +export function issLiveShouldShow({ + enabled, + trackedNorad, + cockpitHeld, + dismissed, +}) { + return ( + Boolean(enabled) && trackedNorad === ISS_NORAD && !cockpitHeld && !dismissed + ); +} + +/** + * NASA's live view from the ISS, in a panel beside the existing tracked card + * while the ISS is selected. The player is created on show and removed on + * hide, so nothing streams while the panel is closed. + */ +export function createIssLive({ state: layerState, parts }) { + let panel = null; + let dismissed = false; + let lastTracked = null; + + function _build(documentRef) { + const root = documentRef.createElement('section'); + root.className = 'iss-live-panel'; + root.setAttribute('role', 'region'); + root.setAttribute('aria-label', t('ISS live video')); + + const header = documentRef.createElement('header'); + header.className = 'iss-live-header'; + const title = documentRef.createElement('span'); + title.className = 'iss-live-title'; + const dotMark = documentRef.createElement('span'); + dotMark.className = 'iss-live-dot'; + dotMark.setAttribute('aria-hidden', 'true'); + title.append(dotMark, documentRef.createTextNode(t('ISS LIVE · NASA'))); + const link = documentRef.createElement('a'); + link.className = 'iss-live-link'; + link.href = issLiveWatchUrl(ISS_LIVE_VIDEO_ID); + link.target = '_blank'; + link.rel = 'noopener noreferrer'; + link.textContent = t('Open on YouTube'); + const close = documentRef.createElement('button'); + close.type = 'button'; + close.className = 'iss-live-close'; + close.textContent = '×'; + close.title = t('Close ISS live video'); + close.setAttribute('aria-label', t('Close ISS live video')); + close.addEventListener('click', () => { + dismissed = true; + _syncIssLive(); + }); + header.append(title, link, close); + + const frame = documentRef.createElement('div'); + frame.className = 'iss-live-frame'; + const iframe = documentRef.createElement('iframe'); + iframe.src = issLiveEmbedUrl(ISS_LIVE_VIDEO_ID); + iframe.title = t('Live views from the International Space Station (NASA)'); + iframe.allow = 'autoplay; encrypted-media; picture-in-picture; fullscreen'; + iframe.allowFullscreen = true; + iframe.referrerPolicy = 'strict-origin-when-cross-origin'; + iframe.loading = 'eager'; + frame.append(iframe); + + root.append(header, frame); + return root; + } + + /** + * Show or hide the panel for the current selection. Cheap when nothing + * changed, so the tracking and Cockpit paths can call it freely. + * @returns {void} + */ + function _syncIssLive() { + const tracked = layerState._trackedNorad; + // A new pick of the ISS brings back a panel closed on an earlier one. + if (tracked !== lastTracked) { + dismissed = false; + lastTracked = tracked; + } + const show = issLiveShouldShow({ + enabled: layerState._enabled, + trackedNorad: tracked, + cockpitHeld: Boolean(parts.cockpit?._cockpitHeld()), + dismissed, + }); + if (!show) { + _removePanel(); + return; + } + if (panel) return; + const documentRef = globalThis.document; + if (!documentRef?.body) return; + panel = _build(documentRef); + documentRef.body.append(panel); + } + + function _removePanel() { + if (!panel) return; + panel.remove(); // the player goes with it, so the stream stops + panel = null; + } + + /** Drop the panel and forget the selection (layer destroy). */ + function _destroyIssLive() { + _removePanel(); + dismissed = false; + lastTracked = null; + } + + return { _syncIssLive, _destroyIssLive }; +} diff --git a/src/layers/satellites/issModel.js b/src/layers/satellites/issModel.js new file mode 100644 index 0000000000..7a699ab351 --- /dev/null +++ b/src/layers/satellites/issModel.js @@ -0,0 +1,281 @@ +import * as Cesium from 'cesium'; +import { eciToGeodetic, gstime, propagate } from 'satellite.js'; +import { + ISS_MODEL_MAX_DISTANCE_M, + ISS_MODEL_MIN_PX, + ISS_MODEL_NATIVE_SPAN, + ISS_MODEL_URL, + ISS_NORAD, + ISS_SPAN_M, +} from './policy.js'; + +/** The model's scale for the real 109 m truss. */ +export const ISS_MODEL_SCALE = ISS_SPAN_M / ISS_MODEL_NATIVE_SPAN; + +/** + * Whether the ISS model may be drawn: the dot's own rules (layer on, points + * on, the ISS loaded and its class shown or the ISS tracked), and not while + * the Cockpit rides the ISS or hides it as a docked companion. + * @param {{enabled: boolean, showPoints: boolean, hasIss: boolean, + * classVisible: boolean, tracked: boolean, cockpitHidden: boolean}} input + * @returns {boolean} + */ +export function issModelShouldShow({ + enabled, + showPoints, + hasIss, + classVisible, + tracked, + cockpitHidden, +}) { + return ( + Boolean(enabled) && + Boolean(showPoints) && + Boolean(hasIss) && + (Boolean(classVisible) || Boolean(tracked)) && + !cockpitHidden + ); +} + +/** + * The station's flight axes in the Earth-fixed frame, from one SGP4 state: + * the ISS normally flies "+XVV", its modules along the velocity, the truss + * across the orbit plane, the same side always to the Earth. Returned as the + * model's local axes: x along-track, y the orbit normal (along the truss), z + * zenith (away from the Earth's centre). + * @param {{x:number,y:number,z:number}} positionEcef Earth-fixed position. + * @param {{x:number,y:number,z:number}} velocityEcefAxes Inertial velocity, + * turned onto the Earth-fixed axes (direction only matters). + * @returns {{x:number[], y:number[], z:number[]}|null} Unit vectors, or null + * for a degenerate state (zero position or velocity along it). + */ +export function issFlightAxes(positionEcef, velocityEcefAxes) { + const r = [positionEcef.x, positionEcef.y, positionEcef.z]; + const v = [velocityEcefAxes.x, velocityEcefAxes.y, velocityEcefAxes.z]; + const z = unit(r); + const y = unit(cross(r, v)); + if (!z || !y) return null; + const x = cross(y, z); + return { x, y, z }; +} + +/** + * Turn an inertial (TEME) vector onto the Earth-fixed axes at `gmst`: the same + * rotation `eciToGeodetic` applies to the position. + * @param {{x:number,y:number,z:number}} v + * @param {number} gmst Radians. + * @returns {{x:number,y:number,z:number}} + */ +export function temeToEcefAxes(v, gmst) { + const c = Math.cos(gmst); + const s = Math.sin(gmst); + return { x: c * v.x + s * v.y, y: -s * v.x + c * v.y, z: v.z }; +} + +function cross(a, b) { + return [ + a[1] * b[2] - a[2] * b[1], + a[2] * b[0] - a[0] * b[2], + a[0] * b[1] - a[1] * b[0], + ]; +} + +function unit(a) { + const n = Math.hypot(a[0], a[1], a[2]); + if (!(n > 0)) return null; + return [a[0] / n, a[1] / n, a[2] / n]; +} + +/** + * The ISS as a 3D model when the camera is close. Far out the dot stays: the + * model and the dot (ambient and tracked) split the distance range, so exactly + * one of them draws. The model loads on first need and only if the ISS is + * shown, and positions itself every frame from its own SGP4 sample (the dot + * moves once a second, which at model range would show as a jump). + */ +export function createIssModel({ state: layerState, parts, resolveAsset }) { + let model = null; + let loading = false; + let failed = false; + let generation = 0; + const nearCondition = new Cesium.DistanceDisplayCondition( + 0, + ISS_MODEL_MAX_DISTANCE_M, + ); + const farCondition = new Cesium.DistanceDisplayCondition( + ISS_MODEL_MAX_DISTANCE_M, + Number.MAX_VALUE, + ); + const scratchPosition = new Cesium.Cartesian3(); + const scratchRotation = new Cesium.Matrix3(); + const scratchColumn = new Cesium.Cartesian3(); + + function _shouldShow() { + const tracked = layerState._trackedNorad === ISS_NORAD; + return issModelShouldShow({ + enabled: layerState._enabled, + showPoints: layerState._params.showPoints, + hasIss: layerState._catalog.has(ISS_NORAD), + classVisible: parts.controls._classVisible(ISS_NORAD), + tracked, + cockpitHidden: + (tracked && parts.cockpit?._cockpitHeld()) || + layerState._cockpitHiddenPoints?.has(ISS_NORAD), + }); + } + + async function _load() { + loading = true; + const loadGeneration = generation; + try { + const loaded = await Cesium.Model.fromGltfAsync({ + url: resolveAsset(ISS_MODEL_URL), + scale: ISS_MODEL_SCALE, + minimumPixelSize: ISS_MODEL_MIN_PX, + distanceDisplayCondition: nearCondition, + // So a click on the model tracks the ISS, as a click on its dot does. + id: ISS_NORAD, + show: false, + }); + const viewer = layerState._viewer; + if (loadGeneration !== generation || !viewer) { + loaded.destroy(); + return; + } + viewer.scene.primitives.add(loaded); + model = loaded; + } catch (error) { + // The dot keeps drawing at every distance; nothing else depends on this. + failed = true; + console.warn('[Data:Satellites] ISS model failed to load:', error); + } finally { + if (loadGeneration === generation) loading = false; + } + } + + /** Leave the near range to the model: the dots draw only beyond it. */ + function _handOverDots() { + const point = layerState._points.get(ISS_NORAD); + if (point && point.distanceDisplayCondition !== farCondition) + point.distanceDisplayCondition = farCondition; + const dot = + layerState._trackedNorad === ISS_NORAD + ? layerState._trackedEntity?.point + : null; + if (dot && !dot.distanceDisplayCondition) + dot.distanceDisplayCondition = farCondition; + } + + /** + * Per-frame update from the layer's preRender tick. + * @returns {void} + */ + function _updateIssModel() { + const show = _shouldShow(); + if (!show) { + if (model) model.show = false; + return; + } + if (!model) { + if (!loading && !failed && resolveAsset) _load(); + return; + } + _handOverDots(); + + const point = layerState._points.get(ISS_NORAD); + const camera = layerState._viewer?.camera; + // Out of range the model would not draw anyway: skip the SGP4 sample. + if ( + point?.position && + camera && + Cesium.Cartesian3.distance(camera.positionWC, point.position) > + ISS_MODEL_MAX_DISTANCE_M * 1.5 + ) { + model.show = false; + return; + } + + const sat = layerState._catalog.get(ISS_NORAD); + const trackedSample = + layerState._trackedNorad === ISS_NORAD && + Number.isFinite(layerState._trackedFrameGeo?.atMs) + ? layerState._trackedFrameGeo + : null; + const date = new Date( + trackedSample ? trackedSample.atMs : layerState.now(), + ); + let posVel; + try { + posVel = propagate(sat.satrec, date); + } catch { + posVel = null; + } + if ( + !posVel?.position || + typeof posVel.position === 'boolean' || + !posVel.velocity || + typeof posVel.velocity === 'boolean' + ) { + model.show = false; + return; + } + const gmst = gstime(date); + if (trackedSample) { + // The sample the follow camera and the tracked dot were placed from. + Cesium.Cartesian3.clone( + layerState._trackedFrameCartesian, + scratchPosition, + ); + } else { + const geo = eciToGeodetic(posVel.position, gmst); + Cesium.Cartesian3.fromRadians( + geo.longitude, + geo.latitude, + geo.height * 1000, + undefined, + scratchPosition, + ); + } + const axes = issFlightAxes( + scratchPosition, + temeToEcefAxes(posVel.velocity, gmst), + ); + if (!axes) { + model.show = false; + return; + } + ['x', 'y', 'z'].forEach((key, column) => { + scratchColumn.x = axes[key][0]; + scratchColumn.y = axes[key][1]; + scratchColumn.z = axes[key][2]; + Cesium.Matrix3.setColumn( + scratchRotation, + column, + scratchColumn, + scratchRotation, + ); + }); + Cesium.Matrix4.fromRotationTranslation( + scratchRotation, + scratchPosition, + model.modelMatrix, + ); + model.show = true; + } + + /** Drop the model (destroy or a fresh init); the next need reloads it. */ + function _destroyIssModel() { + generation += 1; + loading = false; + failed = false; + if (model) { + const scene = layerState._viewer?.scene; + if (scene && scene.primitives.contains(model)) + scene.primitives.remove(model); // remove() destroys + else if (!model.isDestroyed()) model.destroy(); + model = null; + } + } + + return { _updateIssModel, _destroyIssModel }; +} diff --git a/src/layers/satellites/issModel.test.mjs b/src/layers/satellites/issModel.test.mjs new file mode 100644 index 0000000000..a6cad05191 --- /dev/null +++ b/src/layers/satellites/issModel.test.mjs @@ -0,0 +1,151 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFileSync } from 'node:fs'; +import { gstime, propagate, twoline2satrec } from 'satellite.js'; +import { + ISS_MODEL_SCALE, + issFlightAxes, + issModelShouldShow, + temeToEcefAxes, +} from './issModel.js'; +import { + ISS_MODEL_NATIVE_SPAN, + ISS_MODEL_URL, + ISS_NORAD, + ISS_SPAN_M, +} from './policy.js'; + +const ISS_TLE = [ + '1 25544U 98067A 24001.50000000 .00016717 00000-0 10270-3 0 9002', + '2 25544 51.6416 247.4627 0006703 130.5360 325.0288 15.50377579 1234', +]; + +const dot = (a, b) => a[0] * b[0] + a[1] * b[1] + a[2] * b[2]; +const norm = (a) => Math.hypot(a[0], a[1], a[2]); + +const shown = { + enabled: true, + showPoints: true, + hasIss: true, + classVisible: true, + tracked: false, + cockpitHidden: false, +}; + +test('the ISS model shows on the same terms as its dot', () => { + assert.equal(issModelShouldShow(shown), true); + assert.equal(issModelShouldShow({ ...shown, enabled: false }), false); + assert.equal(issModelShouldShow({ ...shown, showPoints: false }), false); + assert.equal(issModelShouldShow({ ...shown, hasIss: false }), false); + assert.equal(issModelShouldShow({ ...shown, classVisible: false }), false); +}); + +test('a tracked ISS keeps its model with its class hidden', () => { + assert.equal( + issModelShouldShow({ ...shown, classVisible: false, tracked: true }), + true, + ); +}); + +test('the Cockpit hold hides the model', () => { + assert.equal( + issModelShouldShow({ ...shown, tracked: true, cockpitHidden: true }), + false, + ); +}); + +test('the model is the ISS by NORAD number, at its real 109 m span', () => { + assert.equal(ISS_NORAD, 25544); + assert.ok( + Math.abs(ISS_MODEL_SCALE * ISS_MODEL_NATIVE_SPAN - ISS_SPAN_M) < 1e-9, + ); +}); + +test('the native span matches the shipped asset', () => { + const glb = readFileSync( + new URL(`../../../public${ISS_MODEL_URL}`, import.meta.url), + ); + const jsonLength = glb.readUInt32LE(12); + const gltf = JSON.parse(glb.subarray(20, 20 + jsonLength).toString('utf8')); + let minX = Infinity; + let maxX = -Infinity; + for (const node of gltf.nodes.filter((n) => n.mesh !== undefined)) { + for (const primitive of gltf.meshes[node.mesh].primitives) { + const accessor = gltf.accessors[primitive.attributes.POSITION]; + minX = Math.min(minX, accessor.min[0] * (node.scale?.[0] ?? 1)); + maxX = Math.max(maxX, accessor.max[0] * (node.scale?.[0] ?? 1)); + } + } + assert.ok(Math.abs(maxX - minX - ISS_MODEL_NATIVE_SPAN) < 0.01); +}); + +test('flight axes: orthonormal, z away from the Earth, x along the motion', () => { + const satrec = twoline2satrec(ISS_TLE[0], ISS_TLE[1]); + for (const minutes of [0, 17, 46, 80]) { + const date = new Date(Date.UTC(2024, 0, 1, 12, minutes)); + const { position, velocity } = propagate(satrec, date); + const gmst = gstime(date); + const r = temeToEcefAxes(position, gmst); + const v = temeToEcefAxes(velocity, gmst); + const axes = issFlightAxes(r, v); + for (const key of ['x', 'y', 'z']) + assert.ok(Math.abs(norm(axes[key]) - 1) < 1e-9); + assert.ok(Math.abs(dot(axes.x, axes.y)) < 1e-9); + assert.ok(Math.abs(dot(axes.y, axes.z)) < 1e-9); + assert.ok(Math.abs(dot(axes.x, axes.z)) < 1e-9); + const rUnit = [r.x, r.y, r.z].map((c) => c / norm([r.x, r.y, r.z])); + assert.ok(dot(axes.z, rUnit) > 0.999999); + // A near-circular orbit: the along-track axis is almost the velocity. + const vUnit = [v.x, v.y, v.z].map((c) => c / norm([v.x, v.y, v.z])); + assert.ok(dot(axes.x, vUnit) > 0.999); + // Right-handed: x × y = z. + const cross = [ + axes.x[1] * axes.y[2] - axes.x[2] * axes.y[1], + axes.x[2] * axes.y[0] - axes.x[0] * axes.y[2], + axes.x[0] * axes.y[1] - axes.x[1] * axes.y[0], + ]; + assert.ok(dot(cross, axes.z) > 0.999999); + } +}); + +test('flight axes refuse a degenerate state', () => { + assert.equal(issFlightAxes({ x: 0, y: 0, z: 0 }, { x: 1, y: 0, z: 0 }), null); + assert.equal(issFlightAxes({ x: 1, y: 0, z: 0 }, { x: 2, y: 0, z: 0 }), null); +}); + +test('TEME to Earth-fixed axes keeps the position eciToGeodetic uses', () => { + const v = temeToEcefAxes({ x: 1, y: 0, z: 0 }, Math.PI / 2); + assert.ok(Math.abs(v.x) < 1e-12); + assert.ok(Math.abs(v.y + 1) < 1e-12); +}); + +test('the ISS live panel follows the ISS selection', async () => { + const { issLiveShouldShow } = await import('./issLive.js'); + const base = { + enabled: true, + trackedNorad: ISS_NORAD, + cockpitHeld: false, + dismissed: false, + }; + assert.equal(issLiveShouldShow(base), true); + assert.equal(issLiveShouldShow({ ...base, trackedNorad: 48274 }), false); + assert.equal(issLiveShouldShow({ ...base, trackedNorad: null }), false); + assert.equal(issLiveShouldShow({ ...base, enabled: false }), false); + assert.equal(issLiveShouldShow({ ...base, cockpitHeld: true }), false); + assert.equal(issLiveShouldShow({ ...base, dismissed: true }), false); +}); + +test("the ISS live player is NASA's stream on the privacy-enhanced host", async () => { + const { issLiveEmbedUrl, issLiveWatchUrl } = await import('./issLive.js'); + const { ISS_LIVE_VIDEO_ID } = await import('./policy.js'); + const embed = new URL(issLiveEmbedUrl(ISS_LIVE_VIDEO_ID)); + assert.equal(embed.origin, 'https://www.youtube-nocookie.com'); + assert.equal(embed.pathname, `/embed/${ISS_LIVE_VIDEO_ID}`); + // Muted, or the browser will not start it on its own. + assert.equal(embed.searchParams.get('mute'), '1'); + assert.equal(embed.searchParams.get('autoplay'), '1'); + assert.equal( + issLiveWatchUrl(ISS_LIVE_VIDEO_ID), + `https://www.youtube.com/watch?v=${ISS_LIVE_VIDEO_ID}`, + ); +}); diff --git a/src/layers/satellites/lifecycle.js b/src/layers/satellites/lifecycle.js index ae30881093..3b14d020dc 100644 --- a/src/layers/satellites/lifecycle.js +++ b/src/layers/satellites/lifecycle.js @@ -36,6 +36,7 @@ export function createLifecycle({ async init(viewer) { parts.catalog._abortActiveUpdates(); clearFocusTarget('satellites'); + parts.issModel?._destroyIssModel(); layerState._viewer = viewer; layerState._catalog = new Map(); layerState._points = new Map(); @@ -130,7 +131,9 @@ export function createLifecycle({ if (layerState._pointCollection) layerState._pointCollection.show = false; for (const path of layerState._orbitPaths.values()) path.primitive.show = false; + parts.issModel?._updateIssModel(); // off: hides the model parts.tracking._clearTracking(); + parts.issLive?._syncIssLive(); // off: closes the live video parts.labels._syncIssOverlay(); // Remove click handler + keydown listener + preRender propagation while disabled if (layerState._clickHandler) { @@ -172,6 +175,8 @@ export function createLifecycle({ } layerState._overlayHost.clearSource(ISS_OVERLAY_SOURCE_ID); layerState._overlayHost.setVisible(ISS_OVERLAY_SOURCE_ID, false); + parts.issModel?._destroyIssModel(); + parts.issLive?._destroyIssLive(); if (layerState._pointCollection) { viewer.scene.primitives.remove(layerState._pointCollection); layerState._pointCollection = null; diff --git a/src/layers/satellites/policy.js b/src/layers/satellites/policy.js index 44b31d814b..f12a28147a 100644 --- a/src/layers/satellites/policy.js +++ b/src/layers/satellites/policy.js @@ -19,6 +19,42 @@ import { SATELLITE_CLASS_DISPLAY, SATELLITE_CLASS_IDS } from './classes.js'; export const ISS_NORAD = 25544; +/** + * The ISS drawn as a 3D model up close (issModel.js): NASA's "International + * Space Station (ISS) (A)" from NASA 3D Resources, shipped unmodified. + */ +export const ISS_MODEL_URL = '/models/iss.glb'; + +/** The real station across its main truss, end to end, in meters. */ +export const ISS_SPAN_M = 109; + +/** + * The asset's truss length in its own units: the mesh's X extent (37.772) + * times the root node's scale (0.678121), read from the file's accessors. + */ +export const ISS_MODEL_NATIVE_SPAN = 25.614; + +/** + * Within this camera distance the model replaces the dot; farther out the dot + * stays. Covers the tracked view (~726 km back for LEO) with room to spare. + */ +export const ISS_MODEL_MAX_DISTANCE_M = 1_500_000; + +/** + * The model is never drawn smaller than this, in pixels. At true size the + * station is under a pixel from the tracked view, so the floor is what makes + * it readable there; within a few kilometres the true size takes over. + */ +export const ISS_MODEL_MIN_PX = 72; + +/** + * NASA's official live stream from the ISS on YouTube ("Live High-Definition + * Views from the International Space Station", channel @NASA), shown in a + * panel while the ISS is selected (issLive.js). A YouTube live keeps its id + * while the broadcast runs; if NASA restarts it under a new id, change it here. + */ +export const ISS_LIVE_VIDEO_ID = 'ROboUHfPUrU'; + export const ISS_OVERLAY_SOURCE_ID = 'satellites-iss'; export const ISS_OVERLAY_SOURCE_OPTIONS = Object.freeze({ diff --git a/src/layers/satellites/rendering.js b/src/layers/satellites/rendering.js index 177884b480..8f445fd129 100644 --- a/src/layers/satellites/rendering.js +++ b/src/layers/satellites/rendering.js @@ -200,6 +200,11 @@ export function createRendering({ if (!layerState._enabled) return; const now = focusNowMs(Date.now()); + // The ISS as a 3D model up close. First, before the tracked sample below + // is refreshed: the follow camera and the tracked dot were placed this + // frame from the sample still cached, and the model must sit on it too. + parts.issModel?._updateIssModel(); + const interval = layerState._trackedNorad ? 200 : POSITION_UPDATE_MS; // Space Missions keeps this layer enabled for TLE lookup while deliberately // hiding its standalone fleet. Do not rebuild hidden point buffers on the @@ -229,6 +234,9 @@ export function createRendering({ if (layerState._cockpitSubjectNorad !== null) parts.cockpit?._syncCockpitSubjectVisuals(); + // NASA's live video beside the card while the ISS is selected. + parts.issLive?._syncIssLive(); + _updatePointFocus(now); // Hidden standalone orbit primitives do not need GMST matrix writes while diff --git a/src/ui/styles/iss-live.css b/src/ui/styles/iss-live.css new file mode 100644 index 0000000000..3e5c4ee6a3 --- /dev/null +++ b/src/ui/styles/iss-live.css @@ -0,0 +1,84 @@ +/* NASA's ISS live video while the ISS is selected (src/layers/satellites/issLive.js). + Bottom right, above the timeline and under the right rail: 300 px wide keeps + it clear of the rail's last item at 720 px tall, and the rail (z-index 110) + stays on top where a shorter window makes them meet. */ +.iss-live-panel { + position: fixed; + right: 16px; + bottom: 96px; + z-index: 40; + width: min(300px, calc(100vw - 32px)); + background: rgba(6, 14, 22, 0.92); + border: 1px solid rgba(0, 220, 255, 0.35); + border-radius: 4px; + box-shadow: 0 8px 28px rgba(0, 0, 0, 0.45); + color: #d8f6ff; + font-family: var(--font-mono); + overflow: hidden; +} + +.iss-live-header { + display: flex; + align-items: center; + gap: 10px; + padding: 6px 8px 6px 10px; + font-size: 11px; + letter-spacing: 0.08em; +} + +.iss-live-title { + display: inline-flex; + align-items: center; + gap: 6px; + flex: 1; + min-width: 0; + color: #ffd84d; +} + +.iss-live-dot { + width: 7px; + height: 7px; + border-radius: 50%; + background: #ff4444; + box-shadow: 0 0 6px #ff4444; +} + +.iss-live-link { + color: #7fe3ff; + text-decoration: none; + white-space: nowrap; +} + +.iss-live-link:hover, +.iss-live-link:focus-visible { + text-decoration: underline; +} + +.iss-live-close { + border: 0; + background: transparent; + color: #d8f6ff; + font-size: 16px; + line-height: 1; + padding: 2px 4px; + cursor: pointer; +} + +.iss-live-close:hover, +.iss-live-close:focus-visible { + color: #ffffff; +} + +.iss-live-frame { + position: relative; + aspect-ratio: 16 / 9; + background: #000; +} + +.iss-live-frame iframe { + position: absolute; + inset: 0; + width: 100%; + height: 100%; + border: 0; +} diff --git a/style.css b/style.css index c91a5b4884..5246158760 100644 --- a/style.css +++ b/style.css @@ -16,6 +16,7 @@ @import './src/ui/styles/layers.css'; @import './src/ui/styles/radio.css'; @import './src/ui/styles/cctv.css'; +@import './src/ui/styles/iss-live.css'; @import './src/ui/styles/quebecCctvOverlay.css'; @import './src/ui/styles/street-level.css'; @import './src/ui/styles/scenes.css';