Merge branch 'main' into pr/mapillary-layer

src/app/constructCatalog.js

@@ -162,7 +162,7 @@ export function createApplicationCatalog({
         }),
         satellites,
         createApplicationLaunches({ source: sources.launches, satellites }),
-        createApplicationTraffic({ source: sources.traffic }),
+        createApplicationTraffic({ source: sources.traffic, surface }),
         createApplicationCctv({ surface, source: sources.cctv }),
         createApplicationRadio({ surface, source: sources.radio }),
         createApplicationTransit({ surface, source: sources.transit }),

src/app/layers/alprCameras.js

@@ -1,3 +1,4 @@
+import * as credits from '../../data/dataCredits.js';
 import { createAlprCamerasLayer } from '../../layers/alpr/index.js';
 import * as render from '../../renderGovernor.js';
 import * as context from '../../data/contextStore.js';
@@ -12,6 +13,7 @@ export function createApplicationAlpr({ surface, source }) {
   return createAlprCamerasLayer({
     source,
     services: {
+      credits,
       render,
       context,
       picking,

src/app/layers/cctv.js

@@ -1,4 +1,5 @@
 import { createCctvLayer } from '../../layers/cctv/index.js';
+import * as credits from '../../data/dataCredits.js';
 import * as sprites from '../../data/spriteOrder.js';
 import * as activation from '../../cctvFocusRequest.js';
 import * as overlays from '../../overlays/worldOverlay.js';
@@ -13,6 +14,7 @@ export function createApplicationCctv({ surface, source }) {
   return createCctvLayer({
     source,
     services: {
+      credits,
       sprites,
       activation,
       overlays,

src/app/layers/militaryInstallations.js

@@ -1,3 +1,5 @@
+import { overlayHost } from './overlayHost.js';
+import * as credits from '../../data/dataCredits.js';
 import { createInstallationsLayer } from '../../layers/installations/index.js';
 import * as render from '../../renderGovernor.js';
 import * as context from '../../data/contextStore.js';
@@ -8,6 +10,27 @@ export function createApplicationInstallations({ surface, source }) {
   const { groundFloor: ground, anchors } = surface;
   return createInstallationsLayer({
     source,
-    services: { render, context, ground, anchors, picking },
+    overlayHost,
+    services: {
+      credits,
+      render,
+      context,
+      ground,
+      anchors,
+      picking,
+      maps: {
+        subscribeMapStack(callback) {
+          globalThis.window?.addEventListener?.(
+            'gev:map-stack-changed',
+            callback,
+          );
+          return () =>
+            globalThis.window?.removeEventListener?.(
+              'gev:map-stack-changed',
+              callback,
+            );
+        },
+      },
+    },
   });
 }

src/app/layers/overlayHost.js

@@ -1,10 +1,12 @@
 import {
   clearOverlaySource,
+  getWorldOverlayDiagnostics,
   setOverlayEntries,
   setOverlaySourceVisible,
 } from '../../overlays/worldOverlay.js';
 export const overlayHost = Object.freeze({
   clearSource: clearOverlaySource,
+  getDiagnostics: getWorldOverlayDiagnostics,
   setEntries: setOverlayEntries,
   setVisible: setOverlaySourceVisible,
 });

src/app/layers/traffic.js

@@ -1,11 +1,12 @@
 import { createTrafficLayer } from '../../layers/traffic/index.js';
 import * as credits from '../../data/dataCredits.js';
+import * as ground from '../../data/groundFloor.js';
 import * as render from '../../renderGovernor.js';
 
 /** Construct one layer using the application scene owners and a supplied source. */
-export function createApplicationTraffic({ source }) {
+export function createApplicationTraffic({ source, surface }) {
   return createTrafficLayer({
     source,
-    services: { credits, render },
+    services: { credits, render, ground: surface?.groundFloor || ground },
   });
 }

src/app/localGeojsonServices.js

@@ -1,3 +1,4 @@
+import { showOsmCredit, hideOsmCredit } from '../data/dataCredits.js';
 import { governorRequestRender } from '../renderGovernor.js';
 import {
   clearSelectedEntityContextForLayer,
@@ -22,4 +23,6 @@ export const localGeoJsonServices = Object.freeze({
   removeEntityContextsForLayer,
   selectEntityContext,
   governorRequestRender,
+  showOsmCredit,
+  hideOsmCredit,
 });

src/app/operations.js

@@ -39,6 +39,7 @@ export function createApplicationOperations({ requests, signal, eventTarget }) {
       searchAndFlyTo(viewer, query, {
         ...options,
         features,
+        ground: surface.groundFloor,
         signal:
           signal && options.signal
             ? AbortSignal.any([signal, options.signal])