mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-20 18:22:25 +00:00
Orbital label clicks, the Sun's "Underneath", zh-Hant 天後側
- The Cockpit's orbital view counts a site's own label as its own, not
another layer's card, so clicking it focuses the site again; the test
now sets the overlay hit test the way the world overlay does.
- The ISS Sun position under the station is "Underneath", with its own
translations; "Below" stays the ground under a satellite.
- OpenCC turns 问天后侧 into 問天后側 ("empress"); a correction makes it 後.
- The changelog says a label takes the click from a vehicle drawn under it.
This commit is contained in:
1 parent
0620d01140
commit
dad59fabbf
18 files changed
+40
-9
No files matched your search
@@ -36,5 +36,6 @@
|
||||
each view is from, and leaving selects the station (Denis Groshev, @ZloyS,
|
||||
#1767).
|
||||
- Let a click on a mapped installation's label box select the site, as a
|
||||
click on its 7 px dot does: from orbit the label is what a click lands on
|
||||
(Denis Groshev, @ZloyS, #1767).
|
||||
click on its 7 px dot does: from orbit the label is what a click lands on.
|
||||
As with every card on top, the label takes the click from an aircraft or
|
||||
vessel drawn under it (Denis Groshev, @ZloyS, #1767).
|
||||
@@ -649,6 +649,8 @@ const ZH_HANT_CORRECTIONS = [
|
||||
['箇中', '個中'],
|
||||
// 周 as a week: the time-lapse speed in weeks per second.
|
||||
[' 周/秒', ' 週/秒'],
|
||||
// 后 as "behind" after a module name (问天, 梦天), not 天后 (empress).
|
||||
['天后側', '天後側'],
|
||||
];
|
||||
|
||||
let s2tw;
|
||||
|
||||
@@ -4547,6 +4547,7 @@
|
||||
"Course to {code}: {course}": "المسار إلى {code}: {course}",
|
||||
"Over {place}": "فوق {place}",
|
||||
"Below": "في الأسفل",
|
||||
"Underneath": "تحت",
|
||||
"Go to this shot. Double-click to rename.": "انتقل إلى هذه اللقطة. انقر نقرًا مزدوجًا لإعادة التسمية.",
|
||||
"Move up": "نقل لأعلى",
|
||||
"Move down": "نقل لأسفل",
|
||||
|
||||
@@ -4135,6 +4135,7 @@
|
||||
"Course to {code}: {course}": "Kurs nach {code}: {course}",
|
||||
"Over {place}": "Über {place}",
|
||||
"Below": "Darunter",
|
||||
"Underneath": "Darunter",
|
||||
"Go to this shot. Double-click to rename.": "Zu dieser Aufnahme wechseln. Doppelklick zum Umbenennen.",
|
||||
"Move up": "Nach oben verschieben",
|
||||
"Move down": "Nach unten verschieben",
|
||||
|
||||
@@ -4238,6 +4238,7 @@
|
||||
"Course to {code}: {course}": "Rumbo a {code}: {course}",
|
||||
"Over {place}": "Sobre {place}",
|
||||
"Below": "Debajo",
|
||||
"Underneath": "Abajo",
|
||||
"Go to this shot. Double-click to rename.": "Ir a este plano. Doble clic para cambiar el nombre.",
|
||||
"Move up": "Subir",
|
||||
"Move down": "Bajar",
|
||||
|
||||
@@ -4238,6 +4238,7 @@
|
||||
"Course to {code}: {course}": "Cap vers {code} : {course}",
|
||||
"Over {place}": "Au-dessus de {place}",
|
||||
"Below": "En dessous",
|
||||
"Underneath": "En dessous",
|
||||
"Go to this shot. Double-click to rename.": "Aller à ce plan. Double-cliquez pour renommer.",
|
||||
"Move up": "Monter",
|
||||
"Move down": "Descendre",
|
||||
|
||||
@@ -4238,6 +4238,7 @@
|
||||
"Course to {code}: {course}": "כיוון אל {code}: {course}",
|
||||
"Over {place}": "מעל {place}",
|
||||
"Below": "מתחת",
|
||||
"Underneath": "מתחת",
|
||||
"Go to this shot. Double-click to rename.": "מעבר לשוט הזה. לחיצה כפולה לשינוי שם.",
|
||||
"Move up": "הזזה למעלה",
|
||||
"Move down": "הזזה למטה",
|
||||
|
||||
@@ -4238,6 +4238,7 @@
|
||||
"Course to {code}: {course}": "Rotta verso {code}: {course}",
|
||||
"Over {place}": "Sopra {place}",
|
||||
"Below": "Sotto",
|
||||
"Underneath": "Sotto",
|
||||
"Go to this shot. Double-click to rename.": "Vai a questo scatto. Doppio clic per rinominare.",
|
||||
"Move up": "Sposta su",
|
||||
"Move down": "Sposta giù",
|
||||
|
||||
@@ -4032,6 +4032,7 @@
|
||||
"Course to {code}: {course}": "{code}への針路: {course}",
|
||||
"Over {place}": "{place}上空",
|
||||
"Below": "直下",
|
||||
"Underneath": "真下",
|
||||
"Go to this shot. Double-click to rename.": "このショットへ移動。ダブルクリックで名前を変更。",
|
||||
"Move up": "上へ移動",
|
||||
"Move down": "下へ移動",
|
||||
|
||||
@@ -4238,6 +4238,7 @@
|
||||
"Course to {code}: {course}": "Rumo para {code}: {course}",
|
||||
"Over {place}": "Sobre {place}",
|
||||
"Below": "Abaixo",
|
||||
"Underneath": "Embaixo",
|
||||
"Go to this shot. Double-click to rename.": "Ir para este plano. Clique duplo para renomear.",
|
||||
"Move up": "Mover para cima",
|
||||
"Move down": "Mover para baixo",
|
||||
|
||||
@@ -4341,6 +4341,7 @@
|
||||
"Course to {code}: {course}": "Курс на {code}: {course}",
|
||||
"Over {place}": "Над: {place}",
|
||||
"Below": "Под спутником",
|
||||
"Underneath": "Снизу",
|
||||
"Go to this shot. Double-click to rename.": "Перейти к этому кадру. Дважды щёлкните, чтобы переименовать.",
|
||||
"Move up": "Переместить вверх",
|
||||
"Move down": "Переместить вниз",
|
||||
|
||||
@@ -4135,6 +4135,7 @@
|
||||
"Course to {code}: {course}": "Kurs mot {code}: {course}",
|
||||
"Over {place}": "Över {place}",
|
||||
"Below": "Nedanför",
|
||||
"Underneath": "Nedanför",
|
||||
"Go to this shot. Double-click to rename.": "Gå till den här tagningen. Dubbelklicka för att byta namn.",
|
||||
"Move up": "Flytta upp",
|
||||
"Move down": "Flytta ned",
|
||||
|
||||
@@ -4341,6 +4341,7 @@
|
||||
"Course to {code}: {course}": "Курс на {code}: {course}",
|
||||
"Over {place}": "Над: {place}",
|
||||
"Below": "Під супутником",
|
||||
"Underneath": "Знизу",
|
||||
"Go to this shot. Double-click to rename.": "Перейти до цього кадру. Двічі клацніть, щоб перейменувати.",
|
||||
"Move up": "Перемістити вгору",
|
||||
"Move down": "Перемістити вниз",
|
||||
|
||||
@@ -4032,6 +4032,7 @@
|
||||
"Course to {code}: {course}": "前往 {code} 的航向:{course}",
|
||||
"Over {place}": "{place}上空",
|
||||
"Below": "下方",
|
||||
"Underneath": "正下方",
|
||||
"Go to this shot. Double-click to rename.": "转到此镜头。双击重命名。",
|
||||
"Move up": "上移",
|
||||
"Move down": "下移",
|
||||
|
||||
@@ -4032,6 +4032,7 @@
|
||||
"Course to {code}: {course}": "前往 {code} 的航向:{course}",
|
||||
"Over {place}": "{place}上空",
|
||||
"Below": "下方",
|
||||
"Underneath": "正下方",
|
||||
"Go to this shot. Double-click to rename.": "轉到此鏡頭。雙擊重命名。",
|
||||
"Move up": "上移",
|
||||
"Move down": "下移",
|
||||
@@ -4303,12 +4304,12 @@
|
||||
"Starboard wing": "右側翼板",
|
||||
"Wentian forward · alpha": "問天前側 · α",
|
||||
"Wentian forward · beta": "問天前側 · β",
|
||||
"Wentian aft · alpha": "問天后側 · α",
|
||||
"Wentian aft · beta": "問天后側 · β",
|
||||
"Wentian aft · alpha": "問天後側 · α",
|
||||
"Wentian aft · beta": "問天後側 · β",
|
||||
"Mengtian forward · alpha": "夢天前側 · α",
|
||||
"Mengtian forward · beta": "夢天前側 · β",
|
||||
"Mengtian aft · alpha": "夢天后側 · α",
|
||||
"Mengtian aft · beta": "夢天后側 · β",
|
||||
"Mengtian aft · alpha": "夢天後側 · α",
|
||||
"Mengtian aft · beta": "夢天後側 · β",
|
||||
"Wentian arm (degrees)": "問天機械臂(度)",
|
||||
"Arrays follow the Sun, the antenna aims at relay satellites and the arms sway for illustration. Computed: China publishes no live telemetry.": "太陽能板跟隨太陽,天線指向中繼衛星,機械臂僅作示意擺動。計算值:中國不公開實時遙測。",
|
||||
"Telemetry reads while the model is on screen": "模型顯示在屏幕上時讀取遙測",
|
||||
|
||||
@@ -22,7 +22,12 @@ export const ISS_SUN_POSES = Object.freeze([
|
||||
sun: unit([0, 0.05, -1]),
|
||||
sunlit: true,
|
||||
},
|
||||
{ id: 'below', label: msg('Below'), sun: unit([0, -1, 0.05]), sunlit: true },
|
||||
{
|
||||
id: 'below',
|
||||
label: msg('Underneath'),
|
||||
sun: unit([0, -1, 0.05]),
|
||||
sunlit: true,
|
||||
},
|
||||
{
|
||||
id: 'port',
|
||||
label: msg('Port side'),
|
||||
|
||||
@@ -300,8 +300,9 @@ export function routeSceneClick() {
|
||||
}
|
||||
return input.onClick((event) => {
|
||||
// Another layer's card or label painted on top takes the click: the site
|
||||
// under it does not focus, and the click does not end a held focus.
|
||||
if (isUnderOtherCard(event)) return;
|
||||
// under it does not focus, and the click does not end a held focus. A
|
||||
// site's own label is not another layer's: it focuses that site.
|
||||
if (isUnderOtherCard(event, [SITES_LAYER_ID])) return;
|
||||
this.onOrbitalClick(event?.position);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1395,6 +1395,15 @@ test("a click on a site's label box focuses it, as one on its dot does", async (
|
||||
// finds the site there, through the label box the overlay paints.
|
||||
assert.equal(sites.findByPick(null), null, 'no draw item at the label');
|
||||
assert.equal(sites.findAt(SITES.alpha.labelAt)?.id, SITES.alpha.id);
|
||||
// The overlay reports the label box as the card on top there, as it does
|
||||
// for an interactive entry: the site's own label is not another layer's.
|
||||
const labels = [SITES.alpha.labelAt];
|
||||
setClickCardHitTest((x, y) =>
|
||||
labels.some((at) => at.x === x && at.y === y)
|
||||
? { sourceId: 'military-installations', entryId: SITES.alpha.id }
|
||||
: null,
|
||||
);
|
||||
t.after(() => setClickCardHitTest(null));
|
||||
scene.click(SITES.alpha.labelAt);
|
||||
assert.equal(cockpit.orbital.focus.key, SITES.alpha.id);
|
||||
assert.equal(handler.stockClicks, 1, 'Cesium still gets the click');
|
||||
|
||||
Reference in new issue
Block a user