mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 08:12:24 +00:00
Fix Data Library share restore, dense tile layers and EPC partition reads
- Share links: the compact /share/<code> format carries the switched-on library entries (field 29), so Copy Link keeps them; a share opened in the same tab restores them; any share decides what is on, so one with every library entry off no longer switches on the recipient's stored entries. - A tile entry too dense at its minimum zoom (Norway cadastre z14, depth z11) is hidden below that scale via minimumTerrainLevel instead of allocating millions of tiles when zoomed out. - EPC partitions keep the full extent for exclusion and the 98 % extent for ranking only; the old trimmed-only extents are retired. - Partition index footers that fail transiently are retried; an incomplete index is never cached as complete, a complete prior index is kept, and it is rebuilt after five minutes. - Views that leave touching partitions unread are partial; listing and footer bodies are capped and ranges validated. - The Browse dialog relabels after a language switch.
This commit is contained in:
1 parent
871b7f0fcc
commit
24ccdd4dc3
20 files changed
+1220
-162
No files matched your search
+45
-11
@@ -7,7 +7,7 @@
|
||||
* width, height, labels, initial and return focus, Escape and dismissal, and
|
||||
* closes itself when clean view, recording or Cockpit hides the panels.
|
||||
*/
|
||||
import { formatNumber, msg, t, tn } from '../i18n/index.js';
|
||||
import { formatNumber, msg, onLocaleChange, t, tn } from '../i18n/index.js';
|
||||
|
||||
const PANEL_HIDING_MODES = ['ui-clean-view', 'recording-mode', 'cockpit-mode'];
|
||||
/** How long Remove all stays armed after its first press. */
|
||||
@@ -219,6 +219,12 @@ export function mountLibraryBrowser({ library, trigger }) {
|
||||
node.addEventListener(type, listener);
|
||||
removers.push(() => node.removeEventListener(type, listener));
|
||||
};
|
||||
// Listeners on the dialog's own nodes, released when it is rebuilt.
|
||||
const dialogRemovers = [];
|
||||
const listenDialog = (node, type, listener) => {
|
||||
node.addEventListener(type, listener);
|
||||
dialogRemovers.push(() => node.removeEventListener(type, listener));
|
||||
};
|
||||
const filter = { query: '', family: '', availableOnly: false };
|
||||
let dialog = null;
|
||||
let list = null;
|
||||
@@ -259,7 +265,7 @@ export function mountLibraryBrowser({ library, trigger }) {
|
||||
);
|
||||
close.type = 'button';
|
||||
close.setAttribute('aria-label', t('Close data library'));
|
||||
listen(close, 'click', () => api.close());
|
||||
listenDialog(close, 'click', () => api.close());
|
||||
header.append(title, close);
|
||||
|
||||
const body = element('div', 'data-library-body');
|
||||
@@ -282,7 +288,8 @@ export function mountLibraryBrowser({ library, trigger }) {
|
||||
search.type = 'search';
|
||||
search.autocomplete = 'off';
|
||||
search.placeholder = t('Name, provider or country');
|
||||
listen(search, 'input', () => {
|
||||
search.value = filter.query;
|
||||
listenDialog(search, 'input', () => {
|
||||
filter.query = search.value;
|
||||
render();
|
||||
});
|
||||
@@ -291,10 +298,16 @@ export function mountLibraryBrowser({ library, trigger }) {
|
||||
const familyLabel = element('label', 'data-library-field');
|
||||
familyLabel.append(element('span', '', t('Theme')));
|
||||
const family = element('select', 'panel-surface-control');
|
||||
family.append(new Option(t('All themes'), ''));
|
||||
const option = (text, value) => {
|
||||
const node = element('option', '', text);
|
||||
node.value = value;
|
||||
return node;
|
||||
};
|
||||
family.append(option(t('All themes'), ''));
|
||||
for (const [value, label] of Object.entries(FAMILY_LABELS))
|
||||
family.append(new Option(t(label), value));
|
||||
listen(family, 'change', () => {
|
||||
family.append(option(t(label), value));
|
||||
family.value = filter.family;
|
||||
listenDialog(family, 'change', () => {
|
||||
filter.family = family.value;
|
||||
render();
|
||||
});
|
||||
@@ -303,7 +316,8 @@ export function mountLibraryBrowser({ library, trigger }) {
|
||||
const availableLabel = element('label', 'data-library-check');
|
||||
const available = element('input');
|
||||
available.type = 'checkbox';
|
||||
listen(available, 'change', () => {
|
||||
available.checked = filter.availableOnly;
|
||||
listenDialog(available, 'change', () => {
|
||||
filter.availableOnly = available.checked;
|
||||
render();
|
||||
});
|
||||
@@ -319,7 +333,7 @@ export function mountLibraryBrowser({ library, trigger }) {
|
||||
status.setAttribute('aria-live', 'polite');
|
||||
resetButton = element('button', 'panel-surface-control data-library-reset');
|
||||
resetButton.type = 'button';
|
||||
listen(resetButton, 'click', () => {
|
||||
listenDialog(resetButton, 'click', () => {
|
||||
if (resetting) return;
|
||||
if (!resetArmed) {
|
||||
resetArmed = true;
|
||||
@@ -344,7 +358,7 @@ export function mountLibraryBrowser({ library, trigger }) {
|
||||
toolbar.append(status, resetButton);
|
||||
|
||||
list = element('ul', 'data-library-list');
|
||||
listen(list, 'click', (event) => {
|
||||
listenDialog(list, 'click', (event) => {
|
||||
const button = event.target?.closest?.('button[data-library-action]');
|
||||
if (!button || button.disabled) return;
|
||||
const id = button.dataset.libraryId;
|
||||
@@ -366,13 +380,13 @@ export function mountLibraryBrowser({ library, trigger }) {
|
||||
|
||||
body.append(stats, intro, filters, toolbar, list);
|
||||
dialog.append(header, body);
|
||||
listen(dialog, 'cancel', (event) => {
|
||||
listenDialog(dialog, 'cancel', (event) => {
|
||||
event.preventDefault();
|
||||
api.close();
|
||||
});
|
||||
// A click on the backdrop (the dialog box itself, outside its content)
|
||||
// dismisses, like Escape.
|
||||
listen(dialog, 'click', (event) => {
|
||||
listenDialog(dialog, 'click', (event) => {
|
||||
if (event.target === dialog) api.close();
|
||||
});
|
||||
document.body.append(dialog);
|
||||
@@ -576,13 +590,33 @@ export function mountLibraryBrowser({ library, trigger }) {
|
||||
destroy() {
|
||||
api.close();
|
||||
unsubscribe();
|
||||
offLocale();
|
||||
observer?.disconnect();
|
||||
for (const remove of removers.splice(0)) remove();
|
||||
for (const remove of dialogRemovers.splice(0)) remove();
|
||||
dialog?.remove();
|
||||
dialog = null;
|
||||
},
|
||||
};
|
||||
|
||||
/**
|
||||
* Every label is translated when the dialog is built, so a language switch
|
||||
* rebuilds it, keeping its filters and, if it was open, opening it again.
|
||||
*/
|
||||
function relabel() {
|
||||
if (!dialog) return;
|
||||
const wasOpen = dialog.open;
|
||||
disarmReset();
|
||||
clearInterval(statsTimer);
|
||||
statsTimer = null;
|
||||
if (wasOpen) dialog.close();
|
||||
for (const remove of dialogRemovers.splice(0)) remove();
|
||||
dialog.remove();
|
||||
dialog = null;
|
||||
if (wasOpen) api.open();
|
||||
}
|
||||
const offLocale = onLocaleChange(relabel);
|
||||
|
||||
const unsubscribe = library.subscribe(render);
|
||||
if (trigger) listen(trigger, 'click', () => api.open());
|
||||
const observer =
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { installVueDom } from '../testSupport/vueDom.mjs';
|
||||
import { setLocale, t } from '../i18n/index.js';
|
||||
|
||||
test('a language switch relabels the open dialog and keeps its filters', async (context) => {
|
||||
context.after(installVueDom());
|
||||
context.after(() => setLocale('en'));
|
||||
const { mountLibraryBrowser } = await import('./libraryBrowser.js');
|
||||
const library = {
|
||||
ready: true,
|
||||
subscribe: () => () => {},
|
||||
list: () => [],
|
||||
summary: () => ({
|
||||
entries: 0,
|
||||
kinds: { dataset: 0, tiles: 0, pack: 0 },
|
||||
themes: [],
|
||||
available: 0,
|
||||
unavailable: 0,
|
||||
added: 0,
|
||||
on: 0,
|
||||
features: 0,
|
||||
featureLayers: 0,
|
||||
}),
|
||||
reset: async () => 0,
|
||||
};
|
||||
const browser = mountLibraryBrowser({ library, trigger: null });
|
||||
context.after(() => browser.destroy());
|
||||
browser.open();
|
||||
const search = () =>
|
||||
document.querySelector('#data-library input[type="search"]');
|
||||
search().value = 'kartverket';
|
||||
search().dispatchEvent(new Event('input'));
|
||||
assert.equal(
|
||||
document.querySelector('#data-library-title').textContent,
|
||||
'DATA LIBRARY',
|
||||
);
|
||||
|
||||
setLocale('de');
|
||||
const title = document.querySelector('#data-library-title');
|
||||
assert.equal(title.textContent, t('DATA LIBRARY'));
|
||||
assert.notEqual(title.textContent, 'DATA LIBRARY');
|
||||
assert.equal(document.querySelectorAll('#data-library').length, 1);
|
||||
assert.equal(document.querySelector('#data-library').open, true);
|
||||
assert.equal(search().value, 'kartverket');
|
||||
|
||||
// Closed and reopened later, it is still in the new language.
|
||||
browser.close();
|
||||
browser.open();
|
||||
assert.equal(
|
||||
document.querySelector('#data-library-title').textContent,
|
||||
t('DATA LIBRARY'),
|
||||
);
|
||||
});
|
||||
Reference in new issue
Block a user