mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-19 09:42:21 +00:00
Merge main into fix/earthquake-click-details
Resolves conflicts with main: a world focus target's own range past its framed radius replaces the kind's range (#1832), so a quake asks for its own range only past M6 and the earthquake framing stays its floor; FIRMS keeps main's marker stand-in under the card-on-top rule; launches keep main's label click and also read the card on top through the pick registry.
This commit is contained in:
commit
e87aa5190d
1337 files changed
+38638
-9950
No files matched your search
@@ -449,9 +449,10 @@ test('clicking a magnitude label selects the quake and flies to it', async () =>
|
||||
assert.ok(
|
||||
Math.hypot(detail.position.x, detail.position.y, detail.position.z) > 6e6,
|
||||
);
|
||||
// The whole disc in view: radius and range scale with the magnitude.
|
||||
// The whole disc in view: the radius scales with the magnitude; up to M6
|
||||
// the framing's own range fits the disc.
|
||||
assert.equal(detail.radiusM, 32000);
|
||||
assert.equal(detail.rangeM, 32000 * 3.5);
|
||||
assert.equal(detail.rangeM, undefined);
|
||||
|
||||
// The keyboard path does the same.
|
||||
assert.equal(
|
||||
|
||||
Reference in new issue
Block a user