Merge current upstream and resolve PR 581 conflicts

scripts/format-scope.json

@@ -4,6 +4,11 @@
   "scripts/format-scope.json",
   "scripts/package-boundaries.json",
   "scripts/format.mjs",
+  "scripts/next-layer-state-token.mjs",
+  "scripts/check-layer-state-tokens.mjs",
+  "scripts/qa-layer-token-twochar.mjs",
+  "src/data/layerStateTokenReservations.json",
+  "src/data/layerStateTokenLedger.test.mjs",
   "scripts/check-package-boundaries.mjs",
   "scripts/precompute-cctv-heights.mjs",
   "src/tooling/precomputeCctvHeights.test.mjs",
@@ -21,11 +26,17 @@
   "src/annotations/drawMode.test.mjs",
   "src/annotations/drawTool.js",
   "src/annotations/drawTool.test.mjs",
+  "src/annotations/adminOutline.test.mjs",
+  "src/annotations/regionRing.test.mjs",
+  "src/data/adminBoundaries.test.mjs",
+  "scripts/build-admin-packs.mjs",
+  "scripts/qa-admin-outlines.mjs",
   "src/data/inputOwnership.test.mjs",
   "docs/CODE-BOUNDARIES.md",
   "src/main.js",
   "docs/APPLICATION.md",
   "scripts/qa-application.mjs",
+  "scripts/qa-terrain-429.mjs",
   "src/app/application.js",
   "src/app/application.test.mjs",
   "src/app/mapLifecycle.test.mjs",
@@ -576,6 +587,8 @@
   "src/maps/imagery.js",
   "src/maps/registry.js",
   "src/maps/terrain.js",
+  "src/maps/terrainRetry.js",
+  "src/maps/terrainRetry.test.mjs",
   "src/mapStackController.js",
   "src/mapStartup.js",
   "src/mapStackChips.test.mjs",
@@ -840,5 +853,17 @@
   "src/ui/imageryBoxTool.test.mjs",
   "src/ui/recentImagery.test.mjs",
   "src/layers/recentImagery/testDoubles.mjs",
-  "scripts/qa-recent-imagery.mjs"
+  "scripts/qa-recent-imagery.mjs",
+  "scripts/qa-overpass-offload.mjs",
+  "src/overpassOffload.test.mjs",
+  "src/sources/openFreeMap.test.mjs",
+  "src/sources/vectorTiles.test.mjs",
+  "src/sources/militaryTileGeometry.test.mjs",
+  "src/layers/traffic/surface.test.mjs",
+  "src/layers/traffic/roadModes.test.mjs",
+  "scripts/qa-traffic-motion.mjs",
+  "src/layers/traffic/motion.test.mjs",
+  "scripts/qa-journey-recorder.mjs",
+  "scripts/qa-alpr-journey.mjs",
+  "scripts/qa-context-arrivals.mjs"
 ]