mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
fix(street-level): links keep the recipient's preferences; aim under the screen centre
Review fixes for gekh's #1113 round: - a link runs show_street_level with origin 'programmatic', so its source switch and layer are not saved as the recipient's preferences; - with no place named, the action looks under the screen centre (aim 'screen-centre', armed false), keeps the sky refusal and leaves a link's armed point alone; - an armed OPEN aimed at the sky opens nothing instead of the far link point; - an imagery-stage failure is spoken as an error, missing imagery as missing (street.nearestOutcome); the card says "the view centre" in the interface language; - every photo the action opens reveals its panel, and revealPanel scrolls the panel into view in the phone sheet; - embed: EXPAND survives embed's own clean view, the lifted photo hides in cockpit, recording and scene playback, and a failed photo step closes the earlier photo before the view flies; - links pasted into an open tab run their street-level step after the restore settles; a superseded start link does not; - Mapillary's nearest search gives up after 12 s, body included.
This commit is contained in:
1 parent
3f55077c2c
commit
451f3e41cf
22 files changed
+716
-64
No files matched your search
@@ -1222,6 +1222,8 @@ export class StyleManager extends ShellFacade {
|
||||
revealPanel(panelId) {
|
||||
const sheet = sheetForPanelId(panelId);
|
||||
if (sheet) this._mobileShell?.setSheet(sheet);
|
||||
// The sheet opens at its top; a panel lower in the rail is scrolled to.
|
||||
document.getElementById(panelId)?.scrollIntoView?.({ block: 'nearest' });
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { StyleManager } from './applicationShell.js';
|
||||
|
||||
test('revealing a panel opens its phone sheet and scrolls the panel into view', () => {
|
||||
const sheets = [];
|
||||
const scrolls = [];
|
||||
const panel = { scrollIntoView: (options) => scrolls.push(options) };
|
||||
const saved = globalThis.document;
|
||||
globalThis.document = {
|
||||
getElementById: (id) => (id === 'street-level-panel' ? panel : null),
|
||||
};
|
||||
try {
|
||||
StyleManager.prototype.revealPanel.call(
|
||||
{ _mobileShell: { setSheet: (sheet) => sheets.push(sheet) } },
|
||||
'street-level-panel',
|
||||
);
|
||||
} finally {
|
||||
globalThis.document = saved;
|
||||
}
|
||||
assert.deepEqual(sheets, ['cameras']);
|
||||
// The panel sits below the sheet's first screen at 375×812.
|
||||
assert.deepEqual(scrolls, [{ block: 'nearest' }]);
|
||||
});
|
||||
@@ -285,8 +285,16 @@ export class StreetLevelControls {
|
||||
this._modesObserver = null;
|
||||
return;
|
||||
}
|
||||
// Embed mode keeps Clean View on for its globe while the photo is lifted
|
||||
// over it: there only recording and the cockpit end EXPAND.
|
||||
const leaveIfHiding = () => {
|
||||
if (PANEL_HIDING_MODES.some((mode) => body.classList.contains(mode)))
|
||||
if (
|
||||
PANEL_HIDING_MODES.some(
|
||||
(mode) =>
|
||||
body.classList.contains(mode) &&
|
||||
!(mode === 'ui-clean-view' && isEmbedPage()),
|
||||
)
|
||||
)
|
||||
this._exitExpanded();
|
||||
};
|
||||
if (!this._modesObserver && typeof MutationObserver === 'function') {
|
||||
|
||||
@@ -622,6 +622,36 @@ for (const mode of ['ui-clean-view', 'recording-mode', 'cockpit-mode'])
|
||||
}
|
||||
}));
|
||||
|
||||
test('in embed mode, which keeps Clean View on for its globe, EXPAND stays; the cockpit still ends it', () =>
|
||||
withDom(async (dom) => {
|
||||
const saved = globalThis.MutationObserver;
|
||||
const watch = fakeMutationObserver();
|
||||
globalThis.MutationObserver = watch.FakeObserver;
|
||||
try {
|
||||
dom.document.body.classList.add('ui-embed');
|
||||
dom.document.body.classList.add('ui-clean-view');
|
||||
const { layer, controls } = await stubPanel(
|
||||
dom,
|
||||
uiState({ open: false }),
|
||||
);
|
||||
await layer.publish(uiState({ open: true }));
|
||||
dom.document.querySelector('#sl-viewer-expand').click();
|
||||
await settle();
|
||||
await settle();
|
||||
watch.fire();
|
||||
await settle();
|
||||
assert.equal(controls.isViewerExpanded(), true, 'EXPAND stays open');
|
||||
dom.document.body.classList.toggle('cockpit-mode', true);
|
||||
watch.fire();
|
||||
await settle();
|
||||
await settle();
|
||||
assert.equal(controls.isViewerExpanded(), false);
|
||||
controls.destroy();
|
||||
} finally {
|
||||
globalThis.MutationObserver = saved;
|
||||
}
|
||||
}));
|
||||
|
||||
/* ── Restores and keyboard rules ───────────────────────────────────────── */
|
||||
|
||||
test('only an explicit switch-on opens the panel, unstored; a restore never does (P2-1)', () =>
|
||||
|
||||
@@ -22,6 +22,14 @@ body.ui-embed .sl-viewer-wrap-embed {
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
/* Cockpit, recording and scene playback own the screen, as they hide the
|
||||
panel elsewhere: the lifted photo steps out of their way. */
|
||||
body.ui-embed.cockpit-mode .sl-viewer-wrap-embed,
|
||||
body.ui-embed.recording-mode .sl-viewer-wrap-embed,
|
||||
body.ui-embed.scene-playback-mode .sl-viewer-wrap-embed {
|
||||
display: none;
|
||||
}
|
||||
|
||||
body.ui-embed .sl-viewer-wrap-embed .sl-viewer-stage,
|
||||
body.ui-embed .sl-viewer-wrap-embed .sl-viewer {
|
||||
flex: 1 1 auto;
|
||||
|
||||
Reference in new issue
Block a user