mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-17 00:32:21 +00:00
Merge main through #1591 into the renderer seam
Brings in the wildlife sightings layer (#1591, iNaturalist and Acartia sightings). Its badges, density glow and privacy cells draw through the draw port: the badges and the glow are icons sets (iconCollection.js batches point writes into one upsert per task), and the privacy cells are ground-clamped shapes and lines sets swapped whole. The eye, the view rectangle, clicks, projection, ground readiness and frames come from the camera, query, input, globe and frame ports, so the layer, its card and its placement no longer import Cesium. Differences from main: the density glow is drawn as pixel-sized splats (56 px) instead of metre-sized ones with a near fade; the card's pan eases with cubicOut, the contract's nearest ease-out; ground heights are resampled when the globe's load progress settles or its surface changes, rather than on tileset load events. Also fixes two things the last merge left: a double-click that starts on the followed track and ends off it reaches the renderer's own follow again (a press that cannot end a double-click on the track gives its hold back at its release), and the Active Fires heat drapes under the weather imagery, so weather turned on after it stacks above. CURRENT-STATE notes that the 2D and Columbus scene-mode checks are gone.
This commit is contained in:
commit
020a433b51
129 files changed
+22143
-336
No files matched your search
@@ -15,11 +15,11 @@
|
||||
const WORLD = Object.freeze({ west: -180, south: -90, east: 180, north: 90 });
|
||||
|
||||
/**
|
||||
* Drawn over the port's other imagery, the weather layers included
|
||||
* (`WEATHER_IMAGERY_Z` tops out at 4): each drape went to the top of the
|
||||
* stack.
|
||||
* Drawn over the port's other imagery (zOrder 0) and under the weather
|
||||
* layers (`WEATHER_IMAGERY_Z` starts at 1), so weather turned on after the
|
||||
* heat stacks above it, as each weather frame went on top of the stack.
|
||||
*/
|
||||
export const HEAT_IMAGERY_Z = 5;
|
||||
export const HEAT_IMAGERY_Z = 0.5;
|
||||
|
||||
const defaultCanvas = (width, height) => {
|
||||
const canvas = document.createElement('canvas');
|
||||
|
||||
@@ -64,7 +64,7 @@ test('setRaster drapes one full-globe tile and replaces it on the next build', (
|
||||
north: 90,
|
||||
});
|
||||
assert.equal(h.layers[0].spec.url, 'data:image/png;base64,AAAA');
|
||||
assert.equal(h.layers[0].spec.zOrder, 5, 'over the other imagery');
|
||||
assert.equal(h.layers[0].spec.zOrder, 0.5, 'over the other imagery');
|
||||
const first = h.layers[0];
|
||||
h.imagery.setRaster(raster);
|
||||
assert.equal(h.layers.length, 1, 'never two heat layers');
|
||||
|
||||
Reference in new issue
Block a user