Merge current main into map-feature refactoring

src/app/constructCatalog.js

@@ -20,6 +20,8 @@ import { createApplicationEarthquakes } from './layers/earthquakes.js';
 import { createApplicationCables } from './layers/submarineCables.js';
 import { createInfrastructureLayers } from '../data/infrastructure.js';
 import { localGeoJsonServices } from './localGeojsonServices.js';
+import { createBhoteKoshiEventLayer } from '../data/bhoteKoshiEvent.js';
+import { createBhoteKoshiLocatorLayer } from '../data/bhoteKoshiLocator.js';
 
 const SOURCE_METHODS = Object.freeze({
   flights: ['getSnapshot'],
@@ -55,6 +57,7 @@ export function createApplicationCatalog({
   metadata = LAYER_STATE_REGISTRY,
   vesselOptions,
   resolveAsset,
+  nepalBoundaryResolver,
 }) {
   if (!signal?.addEventListener)
     throw new TypeError('An application lifetime signal is required');
@@ -101,6 +104,10 @@ export function createApplicationCatalog({
     });
     const catalog = createLayerCatalog(
       [
+        createBhoteKoshiEventLayer(),
+        createBhoteKoshiLocatorLayer({
+          boundaryResolver: nepalBoundaryResolver,
+        }),
         flights,
         military,
         createApplicationEarthquakes({ source: sources.earthquakes }),

src/app/constructCatalog.test.mjs

@@ -4,6 +4,7 @@ import assert from 'node:assert/strict';
 import { createApplicationCatalog } from './constructCatalog.js';
 import { createStandaloneLayerSources } from '../standalone/layerSources.js';
 import { catalogControlServices } from './catalog.js';
+import { LayerLifecycle } from '../data/lifecycle.js';
 
 function fixtureSources(ids, calls) {
   const sources = createStandaloneLayerSources();
@@ -38,7 +39,27 @@ test('catalogs construct distinct layers and classification from their supplied
     signal: b.signal,
     surface: fixtureSurface(b.signal),
   });
-  assert.equal(first.layers.length, 19);
+  assert.equal(first.layers.length, 21);
+  assert.ok(first.get('transit'));
+  assert.ok(first.get('bhote-koshi-2026'));
+  assert.ok(first.get('bhote-koshi-locator'));
+  const lifecycle = new LayerLifecycle({});
+  for (const layer of first.layers) lifecycle.register(layer);
+  const rows = lifecycle.getAll();
+  for (const id of ['bhote-koshi-2026', 'bhote-koshi-locator']) {
+    assert.equal(
+      rows.find((row) => row.id === id)?.showInTogglePanel,
+      false,
+      `${id} remains registered for Scenes but is absent from Data Layers`,
+    );
+    assert.equal(typeof first.get(id).enable, 'function');
+    assert.equal(typeof first.get(id).setParams, 'function');
+  }
+  assert.equal(
+    rows.find((row) => row.id === 'flights')?.showInTogglePanel,
+    true,
+    'ordinary data layer entries remain visible',
+  );
   assert.deepEqual(
     first.layers.map(({ id }) => id),
     second.layers.map(({ id }) => id),

src/app/data.js

@@ -2,7 +2,7 @@ import { LayerLifecycle } from '../data/lifecycle.js';
 import { LayerPresentation } from './layerPresentation.js';
 /** Register the application layer catalog before allowing state restoration. */
 export function createApplicationData({
-  scene: { viewer },
+  scene: { viewer, mapStackController },
   controls: { styleManager },
   catalog,
   allowQaRegistration,
@@ -27,6 +27,8 @@ export function createApplicationData({
     throw new TypeError('An application layer catalog is required');
   for (const layer of catalog.layers) dataManager.register(layer);
   for (const layer of catalog.layers) layer.attachDataManager?.(dataManager);
+  for (const layer of catalog.layers)
+    layer.attachMapStackController?.(mapStackController);
   // Restoration starts only after the caller's complete registry is sealed.
   dataManager.finalizeRegistrations(catalog.metadata);
   if (allowQaRegistration) {

src/app/tools.js

@@ -27,7 +27,13 @@ export function createApplicationTools({
   const { viewer, tileset, mapStackController, operations } = scene;
   const { styleManager, weatherEffects, cockpitCloudEffects } = controls;
   const { dataManager } = data;
-  const sceneDirector = new SceneDirector(viewer, styleManager, dataManager);
+  const sceneDirector = new SceneDirector(viewer, styleManager, dataManager, {
+    isMapStackAvailable: (id) =>
+      mapStackController?.isStackAvailable(id) === true,
+  });
+  dataManager.layers
+    .get('bhote-koshi-2026')
+    ?.module.attachSceneController(sceneDirector);
   defer(() => sceneDirector.destroy());
   onSceneDirector?.(sceneDirector);
   const annotations = initAnnotations({