mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Import GeoJSON, KML, KMZ and GPX files on Navara: shapes as clamped vector layers, pins as sprites, and the graphics it cannot draw counted and reported
This commit is contained in:
1 parent
eee4f48745
commit
d8c63c69d8
22 files changed
+1368
-68
No files matched your search
+43
-10
@@ -1197,14 +1197,16 @@ function checkLocalImages(doc, entries = new Map(), main = '') {
|
||||
|
||||
// Cesium also processes KML in deferred tasks; an exception there does not
|
||||
// reject its load promise. Keep a failed file from blocking the serial queue.
|
||||
async function loadKml(doc, viewer, signal) {
|
||||
// The camera and canvas only feed network links, which sanitizing removed; a
|
||||
// globe engine without a Cesium camera (Navara) passes its canvas alone.
|
||||
async function loadKml(doc, { viewer, engine }, signal) {
|
||||
let removeError;
|
||||
try {
|
||||
return await boundedImport(
|
||||
Promise.race([
|
||||
Cesium.KmlDataSource.load(doc, {
|
||||
camera: viewer.scene.camera,
|
||||
canvas: viewer.scene.canvas,
|
||||
camera: viewer?.scene.camera,
|
||||
canvas: viewer?.scene.canvas ?? engine?.host.canvas,
|
||||
clampToGround: true,
|
||||
}),
|
||||
new Promise((_, reject) => {
|
||||
@@ -1225,7 +1227,7 @@ async function loadKml(doc, viewer, signal) {
|
||||
// Resolve a static file's ground pins in batches before they are visualized.
|
||||
// Per-billboard CLAMP_TO_GROUND subscriptions scale poorly on large imports.
|
||||
const groundPins = new WeakMap();
|
||||
async function settleGroundPins(dataSource, viewer, signal) {
|
||||
async function settleGroundPins(dataSource, { viewer, engine }, signal) {
|
||||
let pins = groundPins.get(dataSource);
|
||||
if (!pins) {
|
||||
pins = [];
|
||||
@@ -1264,6 +1266,31 @@ async function settleGroundPins(dataSource, viewer, signal) {
|
||||
({ cartographic: c }) =>
|
||||
new Cesium.Cartographic(c.longitude, c.latitude, 0),
|
||||
);
|
||||
// A globe engine without a viewer: its terrain under each pin.
|
||||
if (!viewer && engine) {
|
||||
for (let i = 0; i < batch.length; i++) {
|
||||
const item = batch[i];
|
||||
const sampled = engine.surface.terrainHeightSupported
|
||||
? engine.surface.terrainHeight(positions[i])
|
||||
: undefined;
|
||||
const ground = Number.isFinite(sampled)
|
||||
? sampled
|
||||
: (item.groundHeight ?? 0);
|
||||
item.groundHeight = ground;
|
||||
const height = ground + item.offset;
|
||||
item.entity.position =
|
||||
Math.abs(height - item.cartographic.height) < 1e-6
|
||||
? item.original
|
||||
: Cesium.Cartesian3.fromRadians(
|
||||
item.cartographic.longitude,
|
||||
item.cartographic.latitude,
|
||||
height,
|
||||
);
|
||||
}
|
||||
if (at + batch.length < pins.length)
|
||||
await new Promise((resolve) => setTimeout(resolve, 0));
|
||||
continue;
|
||||
}
|
||||
const mesh =
|
||||
viewer.scene?.globe?.show === false &&
|
||||
viewer.scene?.clampToHeightSupported;
|
||||
@@ -1359,14 +1386,18 @@ async function boundedImport(promise, signal) {
|
||||
* Load a ground footprint, retaining explicit KML altitude modes. Call mount after
|
||||
* adding the source; revoke owns pin and blob cleanup.
|
||||
* @param {File|Blob & {name?: string}} file
|
||||
* @param {{viewer: Cesium.Viewer, color?: string}} options `color` is a CSS color.
|
||||
* @param {{viewer?: Cesium.Viewer, engine?: object, color?: string}} options
|
||||
* `color` is a CSS color. Without a viewer, `engine` (a globe engine:
|
||||
* Navara) supplies the ground under the pins, and the pins stay entities
|
||||
* for that engine's own drawing (src/layers/shared/render/navaraStory.js).
|
||||
* @returns {Promise<{dataSource: Cesium.DataSource, name: string,
|
||||
* format: string, entityCount: number, removed: number, mount: Function, revoke: Function}>}
|
||||
*/
|
||||
export async function loadGeoFile(
|
||||
file,
|
||||
{ viewer, color = '#39d0ff', signal } = {},
|
||||
{ viewer = null, engine = null, color = '#39d0ff', signal } = {},
|
||||
) {
|
||||
const globe = { viewer, engine };
|
||||
signal = signal
|
||||
? AbortSignal.any([signal, AbortSignal.timeout(60_000)])
|
||||
: AbortSignal.timeout(60_000);
|
||||
@@ -1449,7 +1480,7 @@ export async function loadGeoFile(
|
||||
deduplicateKmlStyles(doc);
|
||||
const normalizedSize = countKmlGeometry(doc);
|
||||
if (normalizedSize.over) throw overLimitError(normalizedSize);
|
||||
dataSource = await loadKml(doc, viewer, signal);
|
||||
dataSource = await loadKml(doc, globe, signal);
|
||||
}
|
||||
} catch (error) {
|
||||
revoke();
|
||||
@@ -1488,7 +1519,7 @@ export async function loadGeoFile(
|
||||
}
|
||||
scrubImportedEntities(dataSource);
|
||||
try {
|
||||
await settleGroundPins(dataSource, viewer, signal);
|
||||
await settleGroundPins(dataSource, globe, signal);
|
||||
} catch (error) {
|
||||
revoke();
|
||||
throw error instanceof GeoImportError
|
||||
@@ -1501,7 +1532,9 @@ export async function loadGeoFile(
|
||||
// already been stripped and all supported geometries are static.
|
||||
detachImportedTime(dataSource);
|
||||
try {
|
||||
pins = createImportedPins(dataSource, viewer);
|
||||
pins = viewer
|
||||
? createImportedPins(dataSource, viewer)
|
||||
: { mount() {}, sync() {}, destroy() {} };
|
||||
} catch {
|
||||
revoke();
|
||||
throw new GeoImportError(msg('That file has invalid point graphics.'));
|
||||
@@ -1519,7 +1552,7 @@ export async function loadGeoFile(
|
||||
refreshGround: (refreshSignal) =>
|
||||
settleGroundPins(
|
||||
dataSource,
|
||||
viewer,
|
||||
globe,
|
||||
refreshSignal
|
||||
? AbortSignal.any([refreshSignal, AbortSignal.timeout(15_000)])
|
||||
: AbortSignal.timeout(15_000),
|
||||
|
||||
@@ -1262,3 +1262,65 @@ test('KML namespace repair ignores declaration text inside quoted attribute valu
|
||||
/note="xmlns:xsi='x'" xmlns:xsi="http:\/\/www.w3.org\/2001\/XMLSchema-instance">/,
|
||||
);
|
||||
});
|
||||
|
||||
test('on a globe engine without a viewer the pins stay entities on the engine terrain', async () => {
|
||||
const { createFakeEngine } = await import('../globe/testing/fakeEngine.js');
|
||||
const previous = Cesium.PinBuilder.prototype.fromColor;
|
||||
Cesium.PinBuilder.prototype.fromColor = () => ({
|
||||
toDataURL: () => 'data:image/png;base64,local',
|
||||
tagName: 'CANVAS',
|
||||
});
|
||||
try {
|
||||
const engine = createFakeEngine({ kind: 'navara' });
|
||||
engine.fake.script('terrainHeight', 321);
|
||||
const object = {
|
||||
type: 'FeatureCollection',
|
||||
features: [
|
||||
{
|
||||
type: 'Feature',
|
||||
properties: { name: 'Pin' },
|
||||
geometry: { type: 'Point', coordinates: [1, 2] },
|
||||
},
|
||||
{
|
||||
type: 'Feature',
|
||||
geometry: {
|
||||
type: 'LineString',
|
||||
coordinates: [
|
||||
[1, 2],
|
||||
[2, 3],
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
const loaded = await loadGeoFile(
|
||||
new File([JSON.stringify(object)], 'pins.geojson'),
|
||||
{ engine },
|
||||
);
|
||||
const entities = loaded.dataSource.entities.values;
|
||||
assert.equal(entities.length, 2, 'no Cesium billboard collection');
|
||||
assert.equal(loaded.dataSource.importedBillboards, undefined);
|
||||
const [pin] = entities.filter((entity) => entity.billboard);
|
||||
assert.ok(
|
||||
Math.abs(
|
||||
Cesium.Cartographic.fromCartesian(
|
||||
pin.position.getValue(Cesium.JulianDate.now()),
|
||||
).height - 321,
|
||||
) < 1e-3,
|
||||
);
|
||||
// A later ground refresh reads the engine again.
|
||||
engine.fake.script('terrainHeight', 50);
|
||||
await loaded.refreshGround();
|
||||
assert.ok(
|
||||
Math.abs(
|
||||
Cesium.Cartographic.fromCartesian(
|
||||
pin.position.getValue(Cesium.JulianDate.now()),
|
||||
).height - 50,
|
||||
) < 1e-3,
|
||||
);
|
||||
loaded.mount();
|
||||
loaded.revoke();
|
||||
} finally {
|
||||
Cesium.PinBuilder.prototype.fromColor = previous;
|
||||
}
|
||||
});
|
||||
Reference in new issue
Block a user