gloomberb 0.16.2 → 0.16.4

package/src/plugins/builtin/world-indices/client.ts

@@ -2,10 +2,22 @@ import type { DataProvider } from "../../../types/data-provider";
 import type { Quote } from "../../../types/financials";
 import type { IndexEntry } from "./indices";
 import { errorMessage } from "../../../utils/errors";
+import { isNoProviderMessage } from "../../../sources/provider-errors";
+
+/** What a row says in place of figures the feed does not carry. */
+export const NOT_IN_FEED = "not available from the feed";
+
+/** Whether the feed has no quote for a symbol, as opposed to a quote that failed to load. */
+export function isFeedGap(error: string | null | undefined): boolean {
+  return !!error && isNoProviderMessage(error);
+}
 
 export interface WorldIndexQuoteResult {
   quotes: Map<string, Quote | null>;
+  /** Failures to load: a timeout, an outage. A symbol the feed simply lacks is in `gaps`. */
   errors: string[];
+  /** Symbols the feed has no quote for. They are a data gap, so their rows say so rather than carry an error. */
+  gaps: Set<string>;
 }
 
 export async function loadWorldIndexQuotes(
@@ -14,6 +26,12 @@ export async function loadWorldIndexQuotes(
 ): Promise<WorldIndexQuoteResult> {
   const quotes = new Map<string, Quote | null>();
   const errors: string[] = [];
+  const gaps = new Set<string>();
+  const fail = (symbol: string, error: unknown) => {
+    const message = errorMessage(error);
+    if (isFeedGap(message)) gaps.add(symbol);
+    else errors.push(`${symbol}: ${message}`);
+  };
   if (provider.getQuotesBatch) {
     const results = await provider.getQuotesBatch(
       entries.map((entry) => ({ symbol: entry.symbol, exchange: "" })),
@@ -22,10 +40,10 @@ export async function loadWorldIndexQuotes(
     for (const entry of entries) {
       const result = bySymbol.get(entry.symbol);
       quotes.set(entry.symbol, result?.quote ?? null);
-      if (result?.error) errors.push(`${entry.symbol}: ${errorMessage(result.error)}`);
+      if (result?.error) fail(entry.symbol, result.error);
       else if (!result?.quote) errors.push(`${entry.symbol}: quote unavailable`);
     }
-    return { quotes, errors };
+    return { quotes, errors, gaps };
   }
 
   await Promise.all(entries.map(async (entry) => {
@@ -33,8 +51,8 @@ export async function loadWorldIndexQuotes(
       quotes.set(entry.symbol, await provider.getQuote(entry.symbol, ""));
     } catch (error) {
       quotes.set(entry.symbol, null);
-      errors.push(`${entry.symbol}: ${errorMessage(error)}`);
+      fail(entry.symbol, error);
     }
   }));
-  return { quotes, errors };
+  return { quotes, errors, gaps };
 }

package/src/plugins/builtin/world-indices/headless.ts

@@ -5,9 +5,9 @@ import type {
   HeadlessPaneLoadArgs,
 } from "../../../types/plugin";
 import { formatNumber, formatPercentRaw } from "../../../utils/format";
-import { marketStateLabel } from "../../../market-data/market/status";
+import { EXTENDED_SESSION_LABELS, getQuoteSessionFields, marketStateLabel, type ExtendedSession } from "../../../market-data/market/status";
 import type { MarketState } from "../../../types/financials";
-import { loadWorldIndexQuotes, type WorldIndexQuoteResult } from "./client";
+import { loadWorldIndexQuotes, NOT_IN_FEED, type WorldIndexQuoteResult } from "./client";
 import {
   getIndicesByRegion,
   REGION_LABELS,
@@ -17,14 +17,17 @@ import {
 } from "./indices";
 import { quoteFreshnessFields } from "../shared/report-freshness";
 
+/** A row for an index the feed does not carry has no figures to print; its last column says why. */
+const isGap = (row: Record<string, unknown>) => row.unavailable === true;
+
 const COLUMNS = [
-  { key: "shortName", header: "Index" },
+  { key: "shortName", header: "Index", shrink: false },
   { key: "name", header: "Name" },
   {
     key: "price",
     header: "Last",
     align: "right" as const,
-    format: (value: unknown) => value == null
+    format: (value: unknown, row: Record<string, unknown>) => isGap(row) ? "" : value == null
       ? "-"
       : formatNumber(Number(value), 2),
   },
@@ -32,58 +35,82 @@ const COLUMNS = [
     key: "change",
     header: "Change",
     align: "right" as const,
-    format: (value: unknown) => value == null ? "-" : `${Number(value) >= 0 ? "+" : ""}${formatNumber(Number(value), 2)}`,
+    format: (value: unknown, row: Record<string, unknown>) => isGap(row) ? "" : value == null ? "-" : `${Number(value) >= 0 ? "+" : ""}${formatNumber(Number(value), 2)}`,
   },
   {
     key: "changePercent",
     header: "Change %",
     align: "right" as const,
-    format: (value: unknown) => value == null ? "-" : formatPercentRaw(Number(value)),
+    format: (value: unknown, row: Record<string, unknown>) => isGap(row) ? "" : value == null ? "-" : formatPercentRaw(Number(value)),
   },
   {
     key: "marketState",
     header: "Session",
-    format: (value: unknown) => typeof value === "string" && value ? marketStateLabel(value as MarketState) ?? value : "-",
+    shrink: false,
+    format: (value: unknown, row: Record<string, unknown>) => isGap(row) ? "" : typeof value === "string" && value ? marketStateLabel(value as MarketState) ?? value : "-",
   },
   {
     key: "lastUpdated",
     header: "Updated",
-    format: (value: unknown) => {
+    shrink: false,
+    format: (value: unknown, row: Record<string, unknown>) => {
       const time = value == null ? Number.NaN : Number(value);
-      return Number.isFinite(time) ? `${new Date(time).toISOString().slice(0, 16).replace("T", " ")} UTC` : "-";
+      return Number.isFinite(time) ? `${new Date(time).toISOString().slice(0, 16).replace("T", " ")} UTC` : isGap(row) ? NOT_IN_FEED : "-";
     },
   },
 ];
 
+/** A pre-market or after-hours print and its move from the regular close, for a row that has one. */
+function extendedColumn(session: ExtendedSession) {
+  return {
+    key: "extendedPrice",
+    header: EXTENDED_SESSION_LABELS[session],
+    align: "right" as const,
+    format: (value: unknown, row: Record<string, unknown>) => row.extendedSession === session && typeof value === "number"
+      ? `${formatNumber(value, 2)} ${formatPercentRaw(typeof row.extendedChangePercent === "number" ? row.extendedChangePercent : undefined)}`
+      : isGap(row) ? "" : "-",
+  };
+}
+
+/** The table's columns, with an extended column after Change % only where a row has such a print. */
+function sectionColumns(rows: readonly Record<string, unknown>[]) {
+  const sessions = (["PRE", "POST"] as const).filter((session) => rows.some((row) => row.extendedSession === session));
+  return sessions.length === 0 ? COLUMNS : [...COLUMNS.slice(0, 5), ...sessions.map(extendedColumn), ...COLUMNS.slice(5)];
+}
+
 function projectWorldIndicesHeadless(
   entries: readonly IndexEntry[],
   loaded: WorldIndexQuoteResult,
 ): HeadlessBundleResult {
   const grouped = getIndicesByRegion(entries);
+  const isGapEntry = (entry: IndexEntry) => loaded.gaps.has(entry.symbol) && !loaded.quotes.get(entry.symbol);
   return {
     sections: REGION_ORDER.flatMap((region) => {
       const regionEntries = grouped.get(region) ?? [];
       if (regionEntries.length === 0) return [];
-      return [{
-        title: REGION_LABELS[region],
-        columns: COLUMNS,
-        rows: regionEntries.map((entry) => {
-          const quote = loaded.quotes.get(entry.symbol);
-          return {
-            ...quoteFreshnessFields(quote),
-            ...entry,
-            price: quote?.price ?? null,
-            unit: "index points",
-            currency: quote?.currency ?? null,
-            change: quote?.change ?? null,
-            changePercent: quote?.changePercent ?? null,
-            marketState: quote?.marketState ?? null,
-            lastUpdated: quote?.lastUpdated ?? null,
-          };
-        }),
-      }];
+      const rows = regionEntries.map((entry) => {
+        const quote = loaded.quotes.get(entry.symbol);
+        // Last and Change are the regular session, as `ticker` reads them.
+        const { price, change, changePercent, ...extended } = getQuoteSessionFields(quote);
+        return {
+          ...quoteFreshnessFields(quote),
+          ...entry,
+          price,
+          unit: "index points",
+          currency: quote?.currency ?? null,
+          change,
+          changePercent,
+          ...extended,
+          marketState: quote?.marketState ?? null,
+          lastUpdated: quote?.lastUpdated ?? null,
+          ...(isGapEntry(entry) ? { unavailable: true } : {}),
+        };
+      });
+      return [{ title: REGION_LABELS[region], columns: sectionColumns(rows), rows }];
     }),
     errors: loaded.errors,
+    // A symbol the feed lacks is a gap in the data, not a failure: its row says so, and the report is not whole.
+    ...(entries.some(isGapEntry) ? { unavailableSymbols: entries.filter(isGapEntry).map((entry) => entry.symbol) } : {}),
     metadata: {
       requested: entries.length,
       available: [...loaded.quotes.values()].filter(Boolean).length,

package/src/plugins/builtin/world-indices/model.ts

@@ -1,6 +1,6 @@
 import type { MarketState } from "../../../types/financials";
 import { compareSortValues, type SortDirection } from "../../../utils/sort-values";
-import type { BoardQuoteMap } from "../shared/use-quote-board";
+import { boardHeadlineQuote, type BoardQuoteMap } from "../shared/use-quote-board";
 import { REGION_ORDER, type IndexEntry } from "./indices";
 
 export type WorldIndexTableRow =
@@ -40,7 +40,9 @@ function getSortValue(
   entry: IndexEntry,
   quotes: BoardQuoteMap,
 ): string | number | null {
-  const quote = quotes.get(entry.symbol)?.quote;
+  const sent = quotes.get(entry.symbol)?.quote;
+  // Sorted by the figures the rows show.
+  const quote = sent ? boardHeadlineQuote(sent) : sent;
 
   switch (columnId) {
     case "status":

package/src/plugins/builtin/world-indices/table.tsx

@@ -3,7 +3,8 @@ import { colors } from "../../../theme/colors";
 import type { Quote } from "../../../types/financials";
 import { TextAttributes } from "../../../ui";
 import { formatNumber } from "../../../utils/format";
-import { renderQuoteBoardCell, type BoardQuoteMap } from "../shared/use-quote-board";
+import { renderQuoteBoardCell, type BoardQuoteMap, type BoardQuoteState } from "../shared/use-quote-board";
+import { isFeedGap, NOT_IN_FEED } from "./client";
 import type {
   WorldIndexColumnId,
   WorldIndexTableRow,
@@ -66,6 +67,11 @@ const formatIndexPrice = (quote: Quote) => formatNumber(quote.price, 2);
 const formatIndexChange = (quote: Quote) =>
   `${quote.change >= 0 ? "+" : "-"}${formatNumber(Math.abs(quote.change), 2)}`;
 
+/** An index the feed has no quote for: not loading, and no figures to show. */
+function isUnavailableInFeed(state: BoardQuoteState | undefined): boolean {
+  return !!state && !state.quote && !state.loading && isFeedGap(state.error);
+}
+
 export function renderWorldIndexCell(
   row: WorldIndexTableRow,
   column: WorldIndexColumn,
@@ -75,6 +81,8 @@ export function renderWorldIndexCell(
   if (row.type === "header") return { text: "" };
 
   const { entry } = row;
+  // The figures are blank and the name cell says why, ahead of the name so a narrow pane clips the name, not the reason.
+  const unavailable = isUnavailableInFeed(quotes.get(entry.symbol));
   switch (column.id) {
     case "symbol":
       return {
@@ -83,8 +91,11 @@ export function renderWorldIndexCell(
         attributes: TextAttributes.BOLD,
       };
     case "name":
-      return { text: entry.name };
+      return unavailable
+        ? { text: `${NOT_IN_FEED} · ${entry.name}`, color: colors.textDim }
+        : { text: entry.name };
     default:
+      if (unavailable) return { text: "" };
       return renderQuoteBoardCell(column.id, quotes.get(entry.symbol), {
         sessionText: options?.sessionText,
         formatPrice: formatIndexPrice,

package/src/plugins/builtin/world-venue-map/basemap-layer.tsx

@@ -24,6 +24,8 @@ export interface BasemapPalette {
   land: string;
   coast: string;
   border: string;
+  /** Country names. */
+  label: string;
 }
 
 interface BasemapLayerProps {

package/src/plugins/builtin/world-venue-map/basemap.ts

@@ -138,9 +138,13 @@ export function tilesInView(tiles: readonly DetailTile[], view: GeoBox, margin =
   return tiles.filter(({ box }) => box[0] < east && box[2] > west && box[1] < north && box[3] > south);
 }
 
+/** A country name at its label point, with the web-map zoom it first shows at and its rank. */
+export type CountryLabel = readonly [name: string, longitude: number, latitude: number, minZoom: number, rank: number];
+
 /** What `natural-earth/index.chunk.ts` exports. */
 interface BasemapIndex {
   loadWorld: () => Promise<BasemapChunk>;
+  loadLabels: () => Promise<{ COUNTRY_LABELS: readonly CountryLabel[] }>;
   DETAIL_TILES: readonly DetailTile[];
 }
 
@@ -175,6 +179,20 @@ export function loadWorldBasemap(): Promise<BasemapPaths> {
   return worldPaths;
 }
 
+let countryLabels: Promise<readonly CountryLabel[]> | null = null;
+
+/** Country names, most prominent first; a lazy chunk like the land. */
+export function loadCountryLabels(): Promise<readonly CountryLabel[]> {
+  countryLabels ??= loadIndex()
+    .then((index) => index.loadLabels())
+    .then((chunk) => chunk.COUNTRY_LABELS)
+    .catch((error: unknown) => {
+      countryLabels = null;
+      throw error;
+    });
+  return countryLabels;
+}
+
 export function loadDetailIndex(): Promise<readonly DetailTile[]> {
   return loadIndex().then((index) => index.DETAIL_TILES);
 }

package/src/plugins/builtin/world-venue-map/country-labels.ts

@@ -0,0 +1,78 @@
+/**
+ * Which country names the desktop and web map write, and where. Names come
+ * from Natural Earth's label points, most prominent first, each with the
+ * web-map zoom it first shows at. A name shows once the map is that close (a
+ * little before), sits wholly inside the map, and keeps clear of the names
+ * already placed and of the selected or hovered marker. Same view, same names.
+ */
+import type { CountryLabel } from "./basemap";
+
+export interface PlacedCountryLabel {
+  name: string;
+  longitude: number;
+  latitude: number;
+}
+
+/** A marker the names keep clear of, in pixels from the map's top left. */
+export interface LabelObstacle {
+  x: number;
+  y: number;
+  radius: number;
+}
+
+export const COUNTRY_LABEL_FONT_PX = 10;
+/** The map's font is monospaced: every character advances this much of the font size. */
+const CHARACTER_EM = 0.6;
+/** Room kept around a name, so two never touch. */
+const GAP_PX = 6;
+/** Names show at Natural Earth's own zoom; this moves the threshold earlier (positive) or later. */
+const ZOOM_LEAD = 0;
+/** The largest countries are named on any world view, room permitting. */
+const WORLD_VIEW_MIN_ZOOM = 1.7;
+/** Never more names than this on one view. */
+const MAX_LABELS = 60;
+
+/** The web-map zoom (256 px tiles for 360 degrees) of a map drawn at this many pixels per degree. */
+export function webMapZoom(pxPerDegree: number): number {
+  return Math.log2((Math.max(pxPerDegree, 1e-9) * 360) / 256);
+}
+
+export function layoutCountryLabels(
+  labels: readonly CountryLabel[],
+  options: {
+    pxPerDegree: number;
+    /** Where a longitude and latitude fall, in pixels from the map's top left. */
+    toPixels: (longitude: number, latitude: number) => { x: number; y: number };
+    widthPx: number;
+    heightPx: number;
+    obstacles?: readonly LabelObstacle[];
+    fontPx?: number;
+  },
+): PlacedCountryLabel[] {
+  const { toPixels, widthPx, heightPx, obstacles = [] } = options;
+  const fontPx = options.fontPx ?? COUNTRY_LABEL_FONT_PX;
+  if (!(widthPx > 0 && heightPx > 0 && options.pxPerDegree > 0)) return [];
+  const threshold = Math.max(webMapZoom(options.pxPerDegree) + ZOOM_LEAD, WORLD_VIEW_MIN_ZOOM);
+  const taken: [number, number, number, number][] = [];
+  const placed: PlacedCountryLabel[] = [];
+  for (const [name, longitude, latitude, minZoom] of labels) {
+    if (placed.length >= MAX_LABELS) break;
+    if (minZoom > threshold) continue;
+    const { x, y } = toPixels(longitude, latitude);
+    const halfWidth = (name.length * fontPx * CHARACTER_EM) / 2 + GAP_PX / 2;
+    const halfHeight = fontPx / 2 + GAP_PX / 4;
+    const box: [number, number, number, number] = [x - halfWidth, y - halfHeight, x + halfWidth, y + halfHeight];
+    if (box[0] < 0 || box[1] < 0 || box[2] > widthPx || box[3] > heightPx) continue;
+    if (taken.some((other) => box[0] < other[2] && box[2] > other[0] && box[1] < other[3] && box[3] > other[1])) continue;
+    if (obstacles.some((marker) => circleMeetsBox(marker, box))) continue;
+    taken.push(box);
+    placed.push({ name, longitude, latitude });
+  }
+  return placed;
+}
+
+function circleMeetsBox(circle: LabelObstacle, box: readonly [number, number, number, number]): boolean {
+  const nearestX = Math.max(box[0], Math.min(circle.x, box[2]));
+  const nearestY = Math.max(box[1], Math.min(circle.y, box[3]));
+  return Math.hypot(circle.x - nearestX, circle.y - nearestY) < circle.radius;
+}

package/src/plugins/builtin/world-venue-map/geo-series.ts

@@ -13,7 +13,7 @@ import {
 } from "../../../api-client/geo";
 import { chartSeriesProvider, type ChartSeriesCapability, type ChartSeriesCatalogItem } from "../../../capabilities";
 import { subtractTimeRange } from "../../../time-series/date-window";
-import { SERIES_COLORS } from "../../../time-series/resolve";
+import { SERIES_COLORS } from "../../../theme/series-colors";
 import type { ChartViewportSpec, ResolvedSeries, TimeSeriesPoint } from "../../../time-series/types";
 import { GEO_SERIES_CAPABILITY_ID } from "../chart-composer/series-expression";
 import { cloudGeoRequest } from "./client";

package/src/plugins/builtin/world-venue-map/geo-svg.tsx

@@ -357,7 +357,8 @@ export function GeoSvgLayers({ overlay, matrix, project, view, unitPx, mapWidthP
   const selectedLayer = overlay.selected ? overlay.layers.find((layer) => layer.id === overlay.selected!.layerId) ?? null : null;
   const selectedFeature = selectedLayer?.features.find((feature) => feature.id === overlay.selected!.id) ?? null;
   const pxPerDegree = matrix.a * unitPx;
-  const iconScale = { [ICON_SCALE_VAR]: 1 / Math.max(pxPerDegree, Number.EPSILON) } as CSSProperties;
+  // A map with no scale draws nothing; never hand the icons a counter-scale of 1/epsilon.
+  const iconScale = { [ICON_SCALE_VAR]: pxPerDegree > 0 && Number.isFinite(pxPerDegree) ? 1 / pxPerDegree : 0 } as CSSProperties;
   const trailPath = overlay.trail && overlay.trail.length > 1 ? degreePath([overlay.trail], false) : null;
   const points = new Map(overlay.layers.filter((layer) => layer.geometry === "point").map((layer) => {
     const landmark = layer.features.length > 0 && MAP_SYMBOLS[featureSymbol(layer.id, layer.features[0]!).id].landmark === true;

package/src/plugins/builtin/world-venue-map/index.ts

@@ -1,5 +1,5 @@
 import { peekGeoCatalog } from "../../../api-client/geo";
-import { SERIES_COLORS } from "../../../time-series/resolve";
+import { SERIES_COLORS } from "../../../theme/series-colors";
 import { CHART_COMPOSER_PANE_ID } from "../../../types/config";
 import type { PaneTemplateDef } from "../../../types/plugin";
 import { chartHeadless } from "../chart-composer/headless";
@@ -49,7 +49,7 @@ export const worldVenueMapModule: PluginModule = {
   panes: [
     {
       id: WORLD_VENUE_MAP_PANE_ID,
-      name: "World Venue Map",
+      name: "World Map",
       icon: "M",
       component: WorldVenueMapPane,
       defaultPosition: "right",
@@ -63,9 +63,9 @@ export const worldVenueMapModule: PluginModule = {
     {
       id: "world-venue-map-pane",
       paneId: WORLD_VENUE_MAP_PANE_ID,
-      label: "World Venue Map",
-      description: "Trading venues with live status and local time; ships, ports, energy and airports as layers on the same map.",
-      keywords: ["world", "map", "venue", "venues", "exchange", "mic", "market hours", "open markets", "ships", "vessels", "ports", "chokepoints", "pipelines", "airports", "energy", "layers"],
+      label: "World Map",
+      description: "A world map with trading venues and their hours; ships, ports, energy and airports as layers.",
+      keywords: ["world", "map", "globe", "countries", "venue", "venues", "exchange", "mic", "market hours", "open markets", "ships", "vessels", "ports", "chokepoints", "pipelines", "airports", "energy", "layers"],
       shortcut: {
         prefix: "MAP",
         argPlaceholder: "layers",
@@ -78,7 +78,7 @@ export const worldVenueMapModule: PluginModule = {
         const preset = parseMapPreset(options?.arg ?? options?.values?.layers);
         if (!preset) return { placement: "floating" };
         return {
-          title: `Map · ${preset.layers.map(groupTitle).join(", ")}`,
+          title: preset.layers.length ? `Map · ${preset.layers.map(groupTitle).join(", ")}` : "Map · Venues",
           placement: "floating",
           settings: { layers: preset.layers, venues: preset.venues },
         };

package/src/plugins/builtin/world-venue-map/layered-pane.tsx

@@ -49,10 +49,13 @@ import type { GeoLayerState } from "./feed";
 import { geoLayerColor, type GeoMapLayer, type GeoMapOverlay, type GeoMapSelection } from "./geo-draw";
 import { WORLD_VENUE_MAP_PANE_ID } from "./ids";
 import {
+  entityOpenZoom,
+  entityTableBbox,
   featureAnchor,
   formatGeoValue,
   formatTickerLinks,
   isChangeColumn,
+  LAYERS_SETTING_KEY,
   readVenuesSetting,
   sameGeoView,
   tickerLinkKey,
@@ -71,6 +74,8 @@ interface LayeredMapViewProps extends PaneProps {
   layers: GeoLayerInfo[];
   /** The layer ids or groups the pane was asked for. */
   tokens: readonly string[];
+  /** A plain MAP: venues show unless the pane turned them off. */
+  plain?: boolean;
 }
 
 interface OpenEntity {
@@ -80,15 +85,9 @@ interface OpenEntity {
 
 type SortState = { key: string | null; dir: "asc" | "desc" };
 
-/**
- * Zoom an opened entity is shown at: 16 times the world (the server's zoom 4,
- * where dense point layers stop clustering) for a ship or a port, wider for a
- * pipeline or a field.
- */
-function openZoom(layer: GeoLayerInfo): number {
-  return layer.geometry === "point" ? 16 : 4;
-}
 const NO_SORT: SortState = { key: null, dir: "asc" };
+/** How long the map rests before a table that follows it asks again. */
+const TABLE_VIEW_SETTLE_MS = 600;
 /** Layers go closer than venues: 64 times the world is the server's zoom 6, where flights and single ports show. */
 const LAYERED_MAX_ZOOM = 64;
 
@@ -165,7 +164,7 @@ const SelectedEntityHeader = memo(function SelectedEntityHeader({
   );
 });
 
-export function LayeredMapView({ focused, width, height, layers, tokens }: LayeredMapViewProps) {
+export function LayeredMapView({ focused, width, height, layers, tokens, plain = false }: LayeredMapViewProps) {
   const colors = useThemeColors();
   const dark = relativeLuminance(colors.text) > relativeLuminance(colors.bg);
   const { nativePaneChrome } = useUiCapabilities();
@@ -174,7 +173,7 @@ export function LayeredMapView({ focused, width, height, layers, tokens }: Layer
   const { hasProAccess } = usePlanAccess();
   const upgrade = useCloudUpgradeAction("map-layers");
   const [venuesSetting] = usePaneSettingValue<boolean | undefined>(VENUES_SETTING_KEY, undefined);
-  const venuesOn = readVenuesSetting({ [VENUES_SETTING_KEY]: venuesSetting }, layers.length);
+  const venuesOn = readVenuesSetting(plain ? { [VENUES_SETTING_KEY]: venuesSetting } : { [VENUES_SETTING_KEY]: venuesSetting, [LAYERS_SETTING_KEY]: tokens }, layers.length);
   const { data: venueData } = useAsyncResource(venuesOn ? loadWorldVenues : null);
   const [now, setNow] = useState(Date.now());
   useEffect(() => {
@@ -214,16 +213,28 @@ export function LayeredMapView({ focused, width, height, layers, tokens }: Layer
   const [selectedMic, setSelectedMic] = useState<string | null>(null);
   const [headerSubject, setHeaderSubject] = useState<"entity" | "venue">("entity");
   const [focus, setFocus] = useState<WorldMapFocus | null>(null);
+  // Kept per pane, so docking, undocking, popping out or reloading reopens the map where it was.
+  const [savedViewport, setSavedViewport] = usePluginPaneState<unknown>("map:viewport", null);
   const { active: searchFocused, focus: focusSearch, searchProps } = useQueryBarSearch();
   const scrollRef = useRef<ScrollBoxRenderable>(null);
   const detailScrollRef = useRef<ScrollBoxRenderable>(null);
 
   const tableLocked = !canAccess(tableLayer) || tableState?.phase === "locked";
   const tableReadable = tableLayer.status !== "unavailable" && tableState?.phase !== "unavailable" && !tableLocked;
+  // The table follows the map once the view rests, not every frame of a pan.
+  const [tableView, setTableView] = useState<GeoView>(view);
+  useEffect(() => {
+    if (sameGeoView(tableView, view)) return;
+    const timer = setTimeout(() => setTableView(view), TABLE_VIEW_SETTLE_MS);
+    return () => clearTimeout(timer);
+  }, [tableView, view]);
+  const tableBbox = entityTableBbox(tableLayer, tableView);
+  const tableBboxKey = tableBbox?.join(",") ?? "";
   const loadPage = useCallback(async ({ offset, signal }: PageRequest) => {
     const page = await loadEntityPage(tableLayer.id, {
       q: query,
       ...(sort.key ? { sort: sort.key, dir: sort.dir } : {}),
+      ...(tableBbox ? { bbox: tableBbox } : {}),
       offset,
     }, signal);
     const rows = page.rows ?? [];
@@ -234,7 +245,7 @@ export function LayeredMapView({ focused, width, height, layers, tokens }: Layer
       hasMore: rows.length >= ENTITY_PAGE_SIZE && (total === null || offset + rows.length < total),
       nextOffset: offset + rows.length,
     };
-  }, [query, sort.dir, sort.key, tableLayer.id]);
+  }, [query, sort.dir, sort.key, tableBboxKey, tableLayer.id]);
   const pages = usePagedRows(tableReadable ? loadPage : null, { getId: (row) => row.id });
   const rows = pages.rows;
   useWorldMapEvidence(tokens, states, rows.length, pages.loading);
@@ -301,7 +312,7 @@ export function LayeredMapView({ focused, width, height, layers, tokens }: Layer
     const lats = trail.map(([, lat]) => lat);
     const span = Math.max(Math.max(...lons) - Math.min(...lons), (Math.max(...lats) - Math.min(...lats)) * 2, 0.05);
     const last = trail.at(-1)!;
-    setFocus({ key: trailKey, longitude: last[0], latitude: last[1], zoom: Math.min(LAYERED_MAX_ZOOM, Math.max(openZoom(tableLayer), 360 / (span * 3))) });
+    setFocus({ key: trailKey, longitude: last[0], latitude: last[1], zoom: Math.min(LAYERED_MAX_ZOOM, Math.max(entityOpenZoom(tableLayer), 360 / (span * 3))) });
   }, [trailKey]);
   const overlay = useMemo<GeoMapOverlay>(() => ({ layers: mapLayers, selected: selection, trail }), [mapLayers, selection, trail]);
 
@@ -472,7 +483,7 @@ export function LayeredMapView({ focused, width, height, layers, tokens }: Layer
         setHeaderSubject("entity");
         selectRow(row.id);
         setOpen({ layer: tableLayer.id, id: row.id });
-        setFocus({ key: `open:${tableLayer.id}:${row.id}`, longitude: row.lon, latitude: row.lat, zoom: openZoom(tableLayer) });
+        setFocus({ key: `open:${tableLayer.id}:${row.id}`, longitude: row.lon, latitude: row.lat, zoom: entityOpenZoom(tableLayer) });
       }}
       detailOpen={detailOpen}
       onBack={() => setOpen(null)}
@@ -497,7 +508,7 @@ export function LayeredMapView({ focused, width, height, layers, tokens }: Layer
   );
 
   const map = (
-    <Box flexDirection="column" width={mapWidth} height={mapSectionHeight} overflow="hidden">
+    <Box key="map" flexDirection="column" width={mapWidth} height={mapSectionHeight} overflow="hidden">
       {headerSubject === "venue" && selectedVenue && venueData ? (
         <SelectedVenueHeader venue={selectedVenue} checkedAt={venueData.checkedAt} now={now} width={mapWidth} />
       ) : (
@@ -517,6 +528,8 @@ export function LayeredMapView({ focused, width, height, layers, tokens }: Layer
         onSelectGeo={onSelectGeo}
         onViewChange={onViewChange}
         focus={focus}
+        savedViewport={savedViewport}
+        onViewportSettled={setSavedViewport}
       />
     </Box>
   );