mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
feat(street-level): "show me X on Street View" action, street_level view field and sl= links
show_street_level (voice and typed) flies to a place and opens its nearest street-level photo from Google Street View, Mapillary, KartaView or Panoramax; Street View switches to Google 3D first. The view model gains a street_level field, share links carry sl=<source>,<lat>,<lon>, and show_in_gods_eye_view can open a photo. A plain sl=google link only arms the point and waits for OPEN, so it never bills a key without a click. Embed pages show an open photo in an overlay that Esc closes. On-screen strings are translated into es, ru, zh-CN and zh-Hant. Covered by unit tests and three new steps in the Street Level browser suite.
This commit is contained in:
1 parent
f3adccd01a
commit
98de41c94a
64 files changed
+4147
-66
No files matched your search
@@ -1318,9 +1318,12 @@ export class StyleManager extends ShellFacade {
|
||||
};
|
||||
}
|
||||
if (!target.available) {
|
||||
// The controller knows why (Google 3D: no Maps key; others: no ion token).
|
||||
return {
|
||||
ok: false,
|
||||
error: `${target.label} requires a Cesium ion token`,
|
||||
error:
|
||||
target.unavailableReason ||
|
||||
`${target.label} requires a Cesium ion token`,
|
||||
activeStack: this.mapStackController.getActiveId(),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
import assert from 'node:assert/strict';
|
||||
import test from 'node:test';
|
||||
import { StyleManager } from './applicationShell.js';
|
||||
|
||||
test('an unavailable map stack reports the controller’s own reason, not always an ion token', async () => {
|
||||
const controller = {
|
||||
getStacks: () => [
|
||||
{
|
||||
id: 'photoreal',
|
||||
label: 'Google 3D',
|
||||
available: false,
|
||||
unavailableReason: 'Google 3D needs GOOGLE_MAPS_API_KEY',
|
||||
},
|
||||
{ id: 'bing-aerial', label: 'Bing aerial', available: false },
|
||||
],
|
||||
getActiveId: () => 'osm',
|
||||
};
|
||||
const shell = { mapStackController: controller };
|
||||
const photoreal = await StyleManager.prototype.setMapStack.call(
|
||||
shell,
|
||||
'photoreal',
|
||||
);
|
||||
assert.deepEqual(photoreal, {
|
||||
ok: false,
|
||||
error: 'Google 3D needs GOOGLE_MAPS_API_KEY',
|
||||
activeStack: 'osm',
|
||||
});
|
||||
const bing = await StyleManager.prototype.setMapStack.call(
|
||||
shell,
|
||||
'bing-aerial',
|
||||
);
|
||||
assert.equal(bing.error, 'Bing aerial requires a Cesium ion token');
|
||||
});
|
||||
@@ -11,6 +11,11 @@ const RENDER_MODE_KEY = 'gev:street-level:render-mode';
|
||||
/** <body> classes of the modes that hide every panel; an expanded photo leaves with them. */
|
||||
const PANEL_HIDING_MODES = ['ui-clean-view', 'recording-mode', 'cockpit-mode'];
|
||||
|
||||
/** True on an embedded page (`?embed=1` or the inline panel). */
|
||||
function isEmbedPage() {
|
||||
return globalThis.document?.body?.classList?.contains('ui-embed') === true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Drives the Street Level panel body: provider chips, filters and viewer.
|
||||
* The panel view renders what this presents (`gev-street-level` store); the
|
||||
@@ -137,6 +142,15 @@ export class StreetLevelControls {
|
||||
});
|
||||
}
|
||||
this.store.setExpandAvailable(Boolean(this._expandMode));
|
||||
// Embed mode: Esc closes an open photo, since the rail it would go back to
|
||||
// is hidden. Full screen keeps its own Esc (above), which leaves it first.
|
||||
this.listen(document, 'keydown', (event) => {
|
||||
if (event.key !== 'Escape' || !this._embedHome || this.isViewerExpanded())
|
||||
return;
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
this.layer.closeViewer?.();
|
||||
});
|
||||
try {
|
||||
const stored = localStorage.getItem(RENDER_MODE_KEY);
|
||||
if (stored === 'fill' || stored === 'letterbox')
|
||||
@@ -293,6 +307,32 @@ export class StreetLevelControls {
|
||||
this._requestResize();
|
||||
}
|
||||
|
||||
/**
|
||||
* Embed mode hides the right rail, panel and viewer with it: an open photo
|
||||
* moves to <body> as an overlay on the globe (`sl-viewer-wrap-embed`, see
|
||||
* embed.css) and returns to its place in the panel when it closes. The
|
||||
* panel view keeps patching the wrap where it is: its siblings are static,
|
||||
* so Vue never inserts next to it.
|
||||
*/
|
||||
_syncEmbedOverlay(open) {
|
||||
const wrap = this._elements.viewerWrap;
|
||||
if (!wrap || !document.body) return;
|
||||
const lift = open === true && isEmbedPage();
|
||||
if (lift && !this._embedHome) {
|
||||
this._embedHome = { parent: wrap.parentNode, next: wrap.nextSibling };
|
||||
document.body.appendChild(wrap);
|
||||
wrap.classList.add('sl-viewer-wrap-embed');
|
||||
this._requestResize();
|
||||
} else if (!lift && this._embedHome) {
|
||||
wrap.classList.remove('sl-viewer-wrap-embed');
|
||||
const { parent, next } = this._embedHome;
|
||||
this._embedHome = null;
|
||||
if (parent?.isConnected)
|
||||
parent.insertBefore(wrap, next?.parentNode === parent ? next : null);
|
||||
this._requestResize();
|
||||
}
|
||||
}
|
||||
|
||||
connect() {
|
||||
this._unsubscribe?.();
|
||||
this._unsubscribe = null;
|
||||
@@ -350,6 +390,9 @@ export class StreetLevelControls {
|
||||
const open = view.viewer.open;
|
||||
if (open && !this._wasOpen) this.setCollapsed(false, { persist: false });
|
||||
this._wasOpen = open;
|
||||
// Embed mode hides the rail the panel sits in: an open photo is shown over
|
||||
// the globe instead, and goes back into the panel when it closes.
|
||||
this._syncEmbedOverlay(open);
|
||||
}
|
||||
|
||||
destroy() {
|
||||
@@ -362,6 +405,7 @@ export class StreetLevelControls {
|
||||
if (this._expandMode === 'popover')
|
||||
this._elements.viewerWrap?.removeAttribute('popover');
|
||||
this._watchPanelHidingModes(false);
|
||||
this._syncEmbedOverlay(false);
|
||||
this.listeners.abort();
|
||||
this._resizeObserver?.disconnect();
|
||||
this._resizeObserver = null;
|
||||
|
||||
@@ -921,3 +921,103 @@ test('a window changed elsewhere under a focused SINCE thumb leaves its readout
|
||||
assert.equal(since.getAttribute('aria-valuetext'), label());
|
||||
controls.destroy();
|
||||
}));
|
||||
|
||||
/** In embed mode, the viewer moved out of the hidden rail onto the globe. */
|
||||
const overGlobe = (dom) =>
|
||||
dom.wrap.parentNode === dom.document.body &&
|
||||
dom.wrap.classList.contains('sl-viewer-wrap-embed');
|
||||
|
||||
const escape = () =>
|
||||
document.dispatchEvent(
|
||||
new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }),
|
||||
);
|
||||
|
||||
test('in embed mode an open photo leaves the hidden rail for an overlay on the globe, and goes back when it closes', () =>
|
||||
withDom(async (dom) => {
|
||||
dom.document.body.classList.add('ui-embed');
|
||||
const home = dom.wrap.parentNode;
|
||||
const after = dom.wrap.nextSibling;
|
||||
const { layer, controls } = await stubPanel(dom, uiState({ open: false }));
|
||||
assert.equal(overGlobe(dom), false, 'nothing to show yet');
|
||||
await layer.publish(uiState({ open: true }));
|
||||
assert.equal(overGlobe(dom), true, 'shown over the globe');
|
||||
assert.equal(dom.wrap.hidden, false, 'the panel view still renders it');
|
||||
await layer.publish(uiState({ open: true, renderMode: 'fill' }));
|
||||
assert.equal(overGlobe(dom), true, 'an update keeps it there');
|
||||
assert.equal(
|
||||
dom.wrap.querySelector('[aria-checked="true"]')?.textContent.trim(),
|
||||
'FILL',
|
||||
'and the panel view keeps patching it there',
|
||||
);
|
||||
await layer.publish(uiState({ open: false }));
|
||||
assert.equal(overGlobe(dom), false);
|
||||
assertSameNode(dom.wrap.parentNode, home, 'back in the panel');
|
||||
assertSameNode(dom.wrap.nextSibling, after, 'in its own place');
|
||||
assert.equal(dom.wrap.hidden, true);
|
||||
controls.destroy();
|
||||
}));
|
||||
|
||||
test('outside embed mode a photo stays in the panel', () =>
|
||||
withDom(async (dom) => {
|
||||
const home = dom.wrap.parentNode;
|
||||
const { layer, controls } = await stubPanel(dom, uiState({ open: false }));
|
||||
await layer.publish(uiState({ open: true }));
|
||||
assert.equal(overGlobe(dom), false);
|
||||
assertSameNode(dom.wrap.parentNode, home);
|
||||
controls.destroy();
|
||||
}));
|
||||
|
||||
test('in embed mode Esc closes the photo, and the next photo is shown over the globe again', () =>
|
||||
withDom(async (dom) => {
|
||||
dom.document.body.classList.add('ui-embed');
|
||||
const { layer, controls } = await stubPanel(dom, uiState({ open: false }));
|
||||
let closed = 0;
|
||||
layer.closeViewer = () => {
|
||||
closed++;
|
||||
layer.publish(uiState({ open: false }));
|
||||
};
|
||||
await layer.publish(uiState({ open: true }));
|
||||
escape();
|
||||
await nextTick();
|
||||
assert.equal(closed, 1, 'Esc closed the photo');
|
||||
assert.equal(overGlobe(dom), false);
|
||||
await layer.publish(uiState({ open: true }));
|
||||
assert.equal(overGlobe(dom), true, 'the next photo is shown');
|
||||
controls.destroy();
|
||||
}));
|
||||
|
||||
test('in embed mode Esc in full screen leaves full screen and keeps the photo', () =>
|
||||
withDom(async (dom) => {
|
||||
dom.document.body.classList.add('ui-embed');
|
||||
const { layer, controls } = await stubPanel(dom, uiState({ open: false }));
|
||||
let closed = 0;
|
||||
layer.closeViewer = () => closed++;
|
||||
await layer.publish(uiState({ open: true }));
|
||||
await dom.wrap.requestFullscreen();
|
||||
await settle();
|
||||
assert.equal(controls.isViewerExpanded(), true);
|
||||
escape();
|
||||
assert.equal(closed, 0, 'the photo stays open');
|
||||
controls.destroy();
|
||||
}));
|
||||
|
||||
test('outside embed mode Esc does not close a photo in the panel', () =>
|
||||
withDom(async (dom) => {
|
||||
const { layer, controls } = await stubPanel(dom, uiState({ open: true }));
|
||||
let closed = 0;
|
||||
layer.closeViewer = () => closed++;
|
||||
escape();
|
||||
assert.equal(closed, 0);
|
||||
controls.destroy();
|
||||
}));
|
||||
|
||||
test('destroying the panel in embed mode puts an open photo back in the panel', () =>
|
||||
withDom(async (dom) => {
|
||||
dom.document.body.classList.add('ui-embed');
|
||||
const home = dom.wrap.parentNode;
|
||||
const { layer, controls } = await stubPanel(dom, uiState({ open: false }));
|
||||
await layer.publish(uiState({ open: true }));
|
||||
controls.destroy();
|
||||
assert.equal(overGlobe(dom), false);
|
||||
assertSameNode(dom.wrap.parentNode, home);
|
||||
}));
|
||||
@@ -13,3 +13,19 @@ body.ui-embed #world-overlay-actions,
|
||||
body.ui-embed #view-switcher {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
/* Street-level photos: the rail that holds the panel is hidden here, so an
|
||||
open photo shows over the globe (streetLevelControls moves the viewer). */
|
||||
body.ui-embed .sl-viewer-wrap-embed {
|
||||
position: fixed;
|
||||
inset: 12px;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
body.ui-embed .sl-viewer-wrap-embed .sl-viewer-stage,
|
||||
body.ui-embed .sl-viewer-wrap-embed .sl-viewer {
|
||||
flex: 1 1 auto;
|
||||
height: auto;
|
||||
min-height: 0;
|
||||
aspect-ratio: auto;
|
||||
}
|
||||
Reference in new issue
Block a user