mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-20 10:12:18 +00:00
Show drone airspace, OSM places, sea marks and ski pistes on Navara, and keep them across engine switches
This commit is contained in:
1 parent
43b4e9348b
commit
843c4a111d
25 files changed
+838
-295
No files matched your search
@@ -111,6 +111,15 @@ export function createNavaraMaps(
|
||||
}, SETTLE_EVERY_MS);
|
||||
};
|
||||
const slots = { imagery: null, terrain: null, photoreal: null };
|
||||
// Transparent tile overlays (sea marks, ski pistes) above the base
|
||||
// imagery: Navara draws raster layers in the order they were added.
|
||||
const overlays = new Set();
|
||||
function restackOverlays() {
|
||||
for (const overlay of overlays) {
|
||||
overlay.layer.delete();
|
||||
overlay.layer = view.addLayer({ type: 'raster', source: overlay.source });
|
||||
}
|
||||
}
|
||||
// Base imagery and photoreal tiles share one switch order (display): the
|
||||
// call made last decides what shows.
|
||||
const generations = { display: 0, terrain: 0 };
|
||||
@@ -136,6 +145,7 @@ export function createNavaraMaps(
|
||||
const previous = slots[name];
|
||||
const source = view.addSource(sourceDesc);
|
||||
const layer = view.addLayer({ ...layerDesc, source });
|
||||
if (name === 'imagery') restackOverlays();
|
||||
const shown = credits.map((credit) =>
|
||||
typeof credit === 'function' ? credit(layer) : credit,
|
||||
);
|
||||
@@ -291,6 +301,33 @@ export function createNavaraMaps(
|
||||
changed();
|
||||
},
|
||||
photorealActive: () => slots.photoreal != null,
|
||||
/**
|
||||
* Navara-only extension: a transparent XYZ tile overlay ({z}/{x}/{y}
|
||||
* `url`) above the base imagery, with its credit. Returns its removal.
|
||||
*/
|
||||
addOverlay({ url, maxZoom, credit }) {
|
||||
if (destroyed) return () => {};
|
||||
const source = view.addSource({
|
||||
type: 'raster-tile',
|
||||
url,
|
||||
...(maxZoom && { maxZoom }),
|
||||
});
|
||||
const overlay = {
|
||||
source,
|
||||
layer: view.addLayer({ type: 'raster', source }),
|
||||
credits: credit ? [{ attributionHtml: String(credit) }] : [],
|
||||
};
|
||||
overlays.add(overlay);
|
||||
if (overlay.credits.length) view.attribution?.add(overlay.credits);
|
||||
changed();
|
||||
return () => {
|
||||
if (!overlays.delete(overlay)) return;
|
||||
overlay.layer.delete();
|
||||
overlay.source.delete();
|
||||
if (overlay.credits.length) view.attribution?.remove(overlay.credits);
|
||||
changed();
|
||||
};
|
||||
},
|
||||
current: () => ({ baseImagery: currentBase, photoreal: tilesSource }),
|
||||
};
|
||||
|
||||
@@ -300,6 +337,11 @@ export function createNavaraMaps(
|
||||
if (destroyed) return;
|
||||
destroyed = true;
|
||||
stopSettling();
|
||||
for (const overlay of overlays) {
|
||||
overlay.layer.delete();
|
||||
overlay.source.delete();
|
||||
}
|
||||
overlays.clear();
|
||||
for (const name of Object.keys(slots)) clear(name);
|
||||
},
|
||||
};
|
||||
|
||||
@@ -355,3 +355,40 @@ test('after a map change Navara keeps redrawing while tiles arrive, then stops',
|
||||
tick(2000);
|
||||
assert.equal(view.frames, atDestroy);
|
||||
});
|
||||
|
||||
test('a tile overlay stays above the base imagery across map switches and credits its source', async () => {
|
||||
const view = fakeView();
|
||||
const { maps, destroy } = createNavaraMaps(view, {
|
||||
setInterval: () => 1,
|
||||
clearInterval() {},
|
||||
});
|
||||
await maps.setBaseImagery({ kind: 'osm' });
|
||||
const remove = maps.addOverlay({
|
||||
url: 'https://tiles.example/seamark/{z}/{x}/{y}.png',
|
||||
maxZoom: 18,
|
||||
credit: 'Sea marks © example',
|
||||
});
|
||||
const order = () =>
|
||||
view.layers.map(
|
||||
(layer) =>
|
||||
view.sources.find((source) => source === layer.desc.source)?.desc.url,
|
||||
);
|
||||
assert.deepEqual(order(), [
|
||||
'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
|
||||
'https://tiles.example/seamark/{z}/{x}/{y}.png',
|
||||
]);
|
||||
assert.ok(
|
||||
view.shown.some((item) => item.attributionHtml === 'Sea marks © example'),
|
||||
);
|
||||
// A new base layer goes in on top; the overlay is put back above it.
|
||||
await maps.setBaseImagery({ kind: 'esri-imagery' });
|
||||
assert.equal(order().at(-1), 'https://tiles.example/seamark/{z}/{x}/{y}.png');
|
||||
assert.equal(order().length, 2);
|
||||
remove();
|
||||
assert.equal(order().length, 1);
|
||||
assert.ok(
|
||||
!view.shown.some((item) => item.attributionHtml === 'Sea marks © example'),
|
||||
);
|
||||
remove();
|
||||
destroy();
|
||||
});
|
||||
Reference in new issue
Block a user