benmichael/gods-eye-view
1
0 Fork 0
mirror of https://github.com/bilawalsidhu/gods-eye-view.git synced 2026-11-15 15:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into denis/gev-news-layer

Browse Source 
# Conflicts:
#	DATA_SOURCES.md
#	docs/CURRENT-STATE.md
#	src/data/local_data/natural_earth/README.md
#	src/i18n/same-as-english.json
#	style.css
This commit is contained in:
Denis Groshev committed 2026-11-09 15:35:56 +01:00
2 parents a3902590cd a45d6af5f7
commit 0fdde159cb
249 files changed
+26262 -847
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/ui/cockpitBriefing.js
+3 -6
View File
@@ -96,12 +96,9 @@ export function relocalizeBrief() {
Object.assign(this.brief, cycleWords(this.briefAutoRotateEnabled));
this.showBriefPage(this.briefPageIndex);
if (this.regionalBrief)
this.renderRegionalBrief(this.regionalBrief, this.lastAircraftInfo);
this.renderRegionalBrief(this.regionalBrief, this.lastSubjectInfo);
else if (this.brief.news.state)
this.renderRegionalBriefStatus(
this.brief.news.state,
this.lastAircraftInfo,
);
this.renderRegionalBriefStatus(this.brief.news.state, this.lastSubjectInfo);
}
export function setBriefAutoRotate(enabled) {
@@ -167,7 +164,7 @@ export function maybeRefreshRegionalBrief(info) {
!Number.isFinite(info.longitude)
)
return;
const subjectId = `${info.layerId || 'aircraft'}:${info.icao24 || info.registration || info.callsign || 'unknown'}`;
const subjectId = `${info.layerId || 'aircraft'}:${info.icao24 || info.mmsi || info.noradId || info.registration || info.callsign || 'unknown'}`;
if (subjectId !== this.regionalBriefSubjectId) {
this.regionalBriefAbort?.abort();
this.regionalBriefAbort = null;