mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-16 16:22:20 +00:00
Add raster imagery to the globe contract and draw FIRMS heat and Recent Imagery through it
engine.imagery draws raster layers over the globe: Web Mercator tile templates and single images or canvases stretched over a rectangle, with alpha, show, a left/right split against the engine's split position and an order. A layer's source can be replaced in place. - Cesium puts one ImageryLayer per layer on the globe's imagery stack, or on the shown 3D tileset's when the globe is hidden, and moves it when the surface changes; the Recent Imagery request gate moved here. - Navara draws them in one screen pass after tone mapping that samples up to eight layers by geodetic position from mipmapped textures and a tile atlas, under the other drapes and engine.ground. - The fake engine keeps each layer's state. The FIRMS far-zoom heat raster and Recent Imagery now draw through it, so FIRMS' heat seam and both its backends, and Recent Imagery's Cesium and Navara renderers and tile plan, go. Against HEAD, Cesium's pixels are identical in all four compared scenes; Navara's orbital heat changes by a mean of 3.8 from new mipmapping, slightly towards Cesium. The contract suite passes on both engines (Cesium 68/68, Navara 71/71). engine.maps.addOverlay stays a Navara-only extension for Sea Marks and Ski Pistes until imagery has a finer tile path for oblique global views.
This commit is contained in:
1 parent
1559bd57f4
commit
406dd9122e
52 files changed
+4171
-1988
No files matched your search
@@ -1,22 +1,21 @@
|
||||
import { createRecentImageryLayer } from '../../layers/recentImagery/index.js';
|
||||
import { createRecentImageryRenderer } from '../../layers/recentImagery/rendering.js';
|
||||
import { createThumbnailLoader } from '../../layers/recentImagery/thumbnails.js';
|
||||
import { governorRequestRender } from '../../renderGovernor.js';
|
||||
import { rendererFor } from './renderers.js';
|
||||
|
||||
/** Construct imagery presentation over one explicitly supplied acquisition source. */
|
||||
/**
|
||||
* Construct imagery presentation over one explicitly supplied acquisition
|
||||
* source; it draws with the engine's renderer from the registry
|
||||
* (render/display.js on every engine).
|
||||
*/
|
||||
export function createApplicationRecentImagery({ source }) {
|
||||
const options = {
|
||||
requestRender: governorRequestRender,
|
||||
tileTemplate: (...args) => source.getTileTemplate(...args),
|
||||
credit: source.credit || source.label || 'Imagery',
|
||||
};
|
||||
return createRecentImageryLayer({
|
||||
catalog: { searchHls: (...args) => source.searchHls(...args) },
|
||||
rendererFactory: ({ engine }) =>
|
||||
engine?.kind === 'navara'
|
||||
? rendererFor('recent-imagery', engine, options)
|
||||
: createRecentImageryRenderer(options),
|
||||
rendererFor('recent-imagery', engine, options),
|
||||
thumbnails: createThumbnailLoader({
|
||||
requestThumbnail: (...args) => source.getThumbnail(...args),
|
||||
}),
|
||||
|
||||
@@ -52,6 +52,7 @@ import { createAwarenessDisplay } from '../../layers/awareness/render/display.js
|
||||
import { createStreetLevelDisplay } from '../../layers/streetLevel/render/display.js';
|
||||
import { createTrafficDisplay } from '../../layers/traffic/render/display.js';
|
||||
import { createDirectionsDisplay } from '../../layers/directions/render/display.js';
|
||||
import { createRecentImageryDisplay } from '../../layers/recentImagery/render/display.js';
|
||||
|
||||
const ENGINE_KINDS = new Set(['cesium', 'navara']);
|
||||
|
||||
@@ -139,6 +140,7 @@ export const CESIUM_LAYER_RENDERERS = Object.freeze({
|
||||
'street-level': createStreetLevelDisplay,
|
||||
traffic: createTrafficDisplay,
|
||||
directions: createDirectionsDisplay,
|
||||
'recent-imagery': createRecentImageryDisplay,
|
||||
});
|
||||
|
||||
// The other application layers still draw themselves on Cesium.
|
||||
|
||||
@@ -88,6 +88,7 @@ test('the layers with extracted renderers', () => {
|
||||
'street-level',
|
||||
'traffic',
|
||||
'directions',
|
||||
'recent-imagery',
|
||||
]);
|
||||
});
|
||||
|
||||
@@ -117,6 +118,8 @@ test('the layers drawn through one display get the same factory on every engine'
|
||||
'street-level': ['streetLevel', 'createStreetLevelDisplay'],
|
||||
traffic: ['traffic', 'createTrafficDisplay'],
|
||||
directions: ['directions', 'createDirectionsDisplay'],
|
||||
'local-firms': ['firms', 'createFirmsDisplay'],
|
||||
'recent-imagery': ['recentImagery', 'createRecentImageryDisplay'],
|
||||
'telegeography-submarine-cables': [
|
||||
'submarineCables',
|
||||
'createCablesDisplay',
|
||||
|
||||
Reference in new issue
Block a user