refactor: own application request operations and surface caches

src/app/layers/alprCameras.js

@@ -2,10 +2,10 @@ import { createAlprCamerasLayer } from '../../layers/alpr/index.js';
 import * as render from '../../renderGovernor.js';
 import * as context from '../../data/contextStore.js';
 import * as picking from '../../data/pickRegistry.js';
-import * as groundFloor from '../../data/groundFloor.js';
 
 /** Construct one layer using the application scene owners and a supplied source. */
-export function createApplicationAlpr({ source }) {
+export function createApplicationAlpr({ surface, source }) {
+  const { groundFloor } = surface;
   return createAlprCamerasLayer({
     source,
     services: { render, context, picking, groundFloor },

src/app/layers/cctv.js

@@ -4,14 +4,12 @@ import * as activation from '../../cctvFocusRequest.js';
 import * as overlays from '../../overlays/worldOverlay.js';
 import * as locations from '../../locations.js';
 import * as picking from '../../data/pickRegistry.js';
-import * as terrain from '../../data/terrainHeights.js';
-import * as ground from '../../data/groundFloor.js';
-import * as mesh from '../../data/meshFloorSampler.js';
 import * as focus from '../../data/focusDeemphasis.js';
 import * as render from '../../renderGovernor.js';
 
 /** Construct one layer using the application scene owners and a supplied source. */
-export function createApplicationCctv({ source }) {
+export function createApplicationCctv({ surface, source }) {
+  const { terrain, groundFloor: ground, meshFloor: mesh } = surface;
   return createCctvLayer({
     source,
     services: {

src/app/layers/firms.js

@@ -4,7 +4,6 @@ import * as render from '../../renderGovernor.js';
 import * as sprites from '../../data/spriteOrder.js';
 import * as context from '../../data/contextStore.js';
 import * as picking from '../../data/pickRegistry.js';
-import * as anchors from '../../data/fireAnchors.js';
 import * as overlays from '../../overlays/worldOverlay.js';
 import * as focus from '../../worldFocus.js';
 export const firmsServices = {
@@ -12,19 +11,18 @@ export const firmsServices = {
   sprites,
   context,
   picking,
-  anchors,
   overlays,
   focus,
 };
 
 /** Bind a supplied fire feed to the application scene service owners. */
-export function createApplicationFirms(options) {
+export function createApplicationFirms({ surface, ...options }) {
   return createLayer({
     ...options,
     icon: options.icon ?? '▲',
     source: options.source ?? 'NASA FIRMS',
     feed: options.feed,
-    services: firmsServices,
+    services: { ...firmsServices, anchors: surface.anchors },
     overlayHost: options.overlayHost ?? {
       setEntries: overlays.setOverlayEntries,
       setVisible: overlays.setOverlaySourceVisible,

src/app/layers/flights.js

@@ -5,23 +5,22 @@ import * as trails from '../../data/trailRenderer.js';
 import * as aircraftPresentation from '../../data/tr3bRegistry.js';
 import * as camera from '../../data/trackedCamera.js';
 import * as labels from '../../data/detectionDraw.js';
-import * as groundFloor from '../../data/groundFloor.js';
-import * as meshFloor from '../../data/meshFloorSampler.js';
 import * as geoid from '../../data/geoid.js';
 import * as focus from '../../data/focusDeemphasis.js';
 import * as readout from '../../data/trackedReadout.js';
 import * as context from '../../data/contextStore.js';
 import * as render from '../../renderGovernor.js';
-import * as groundSnap from '../../data/groundSnap.js';
 import * as recession from '../../data/aircraftRecession.js';
 
 /** Construct one layer using the application scene owners and a supplied source. */
 export function createApplicationFlights({
+  surface,
   source,
   militaryRegistry,
   resolveAsset = (url) =>
     `${import.meta.env?.BASE_URL || '/'}${url.replace(/^\//, '')}`,
 }) {
+  const { groundFloor, meshFloor, groundSnap } = surface;
   return createCivilFlightLayer({
     source,
     resolveAsset,

src/app/layers/militaryFlights.js

@@ -5,23 +5,22 @@ import * as trails from '../../data/trailRenderer.js';
 import * as aircraftPresentation from '../../data/tr3bRegistry.js';
 import * as camera from '../../data/trackedCamera.js';
 import * as labels from '../../data/detectionDraw.js';
-import * as groundFloor from '../../data/groundFloor.js';
-import * as meshFloor from '../../data/meshFloorSampler.js';
 import * as geoid from '../../data/geoid.js';
 import * as focus from '../../data/focusDeemphasis.js';
 import * as readout from '../../data/trackedReadout.js';
 import * as context from '../../data/contextStore.js';
 import * as render from '../../renderGovernor.js';
-import * as groundSnap from '../../data/groundSnap.js';
 import * as recession from '../../data/aircraftRecession.js';
 
 /** Construct one layer using the application scene owners and a supplied source. */
 export function createApplicationMilitary({
+  surface,
   source,
   militaryRegistry,
   resolveAsset = (url) =>
     `${import.meta.env?.BASE_URL || '/'}${url.replace(/^\//, '')}`,
 }) {
+  const { groundFloor, meshFloor, groundSnap } = surface;
   return createMilitaryFlightLayer({
     source,
     resolveAsset,

src/app/layers/militaryInstallations.js

@@ -1,12 +1,11 @@
 import { createInstallationsLayer } from '../../layers/installations/index.js';
 import * as render from '../../renderGovernor.js';
 import * as context from '../../data/contextStore.js';
-import * as ground from '../../data/groundFloor.js';
-import * as anchors from '../../data/fireAnchors.js';
 import * as picking from '../../data/pickRegistry.js';
 
 /** Construct one layer using the application scene owners and a supplied source. */
-export function createApplicationInstallations({ source }) {
+export function createApplicationInstallations({ surface, source }) {
+  const { groundFloor: ground, anchors } = surface;
   return createInstallationsLayer({
     source,
     services: { render, context, ground, anchors, picking },

src/app/layers/radio.js

@@ -1,12 +1,12 @@
 import { createRadioLayer } from '../../layers/radio/index.js';
-import * as ground from '../../data/groundFloor.js';
 import * as picking from '../../data/pickRegistry.js';
 import * as overlays from '../../overlays/worldOverlay.js';
 import * as globe from '../../celestialRing.js';
 import * as render from '../../renderGovernor.js';
 
 /** Construct one layer using the application scene owners and a supplied source. */
-export function createApplicationRadio({ source }) {
+export function createApplicationRadio({ surface, source }) {
+  const { groundFloor: ground } = surface;
   return createRadioLayer({
     source,
     services: { ground, picking, overlays, globe, render },