@7365admin1/layer-common 4.97.1-staging.607 → 4.97.1-staging.608

package/components/Robot/BuildingMap.vue

@@ -83,7 +83,7 @@
         </div>
         <div class="hero-bmap__seg" role="group" aria-label="Floor">
           <button type="button" :aria-pressed="focus === null" @click="focus = null">All</button>
-          <button v-for="f in floors" :key="f" type="button" :aria-pressed="focus === f" @click="focus = f">{{ floorName(f) }}</button>
+          <button v-for="f in floors" :key="f" type="button" :aria-pressed="focus === f" @click="focus = f">{{ levelName(f) }}</button>
         </div>
         <span class="hero-bmap__readout">{{ cameraReadout(cam) }}</span>
         <span class="hero-bmap__readout">Drag to rotate · shift+drag or right-drag to pan · scroll to zoom</span>
@@ -184,7 +184,7 @@
               </button>
             </div>
 
-            <div class="hero-bmap__floorlabel" :style="{ transform: `translateZ(6px) ${unskew}` }">{{ floorName(f.floorNo) }}</div>
+            <div class="hero-bmap__floorlabel" :style="{ transform: `translateZ(6px) ${unskew}` }">{{ levelName(f.floorNo) }}</div>
           </div>
 
           <div
@@ -212,7 +212,7 @@
     <aside class="hero-bmap__aside">
       <div class="hero-aside__title hero-bmap__asidetitle">Floors · top down</div>
       <div v-for="f in legend" :key="f.floorNo" class="hero-bmap__legendrow">
-        <b>{{ floorName(f.floorNo) }}</b>
+        <b>{{ levelName(f.floorNo) }}</b>
         <div v-if="f.robotMaps.length" class="hero-mapsel__hint">Robot map: {{ f.robotMaps.map((m) => m.label + (m.current ? " (robot is here)" : "")).join(", ") }}</div>
         <div class="hero-bmap__chips">
           <button v-for="r in f.robots" :key="r.id" type="button" class="hero-bmap__chip" @click="emit('open', r.id)"><span :class="`hero-tone--${tone(r)}`">{{ r.name }}</span></button>
@@ -242,11 +242,12 @@ import { floorAspect, floorDoors, placementInWorld, planBoxIn, routeOverlay, vie
 import useRobotLive, { siteStatesFeed } from "../../composables/useRobotLive";
 import { openDoorNames } from "../../utils/robot-fleet-core";
 import { robotMapViews, robotMapsByFloor, type TRobotMapView } from "../../utils/robot-maps";
+import { siteFloorKey, siteFloorLabel, type TSiteFloor } from "../../utils/robot-floors";
 import {
   BUILDING_TAG,
   nameTagSide,
   brandName,
-  floorName,
+  siteFloorOf,
   mapFloors,
   mapRobots,
   pickFloor,
@@ -319,7 +320,19 @@ const siteLabel = computed(() => props.siteName || names.value.siteName || "This
 const ids = computed(() => rows.value.map((r) => String(r._id)));
 const { states, connected } = useRobotLive(ids, siteStatesFeed());
 const routes = ref<Record<string, TPatrolRouteView[]>>({});
-const { getPatrolRoutes, getRobotBrands, getRobotMaps } = useRobots();
+const { getPatrolRoutes, getRobotBrands, getRobotMaps, getSiteFloors } = useRobots();
+/** The site's floor names: the robots' own maps and routes go on the site floor (the PadBot's 3 = 34). */
+const siteFloors = ref<TSiteFloor[]>([]);
+watch(
+  () => props.site,
+  async (site) => {
+    siteFloors.value = [];
+    const res = await getSiteFloors(site).catch(() => null);
+    if (site === props.site) siteFloors.value = res?.floors ?? [];
+  },
+  { immediate: true },
+);
+const levelName = (f: number) => siteFloorLabel(siteFloors.value, f, states.value);
 /** Each security robot's own maps (PadBot), read once per robot: drawn on their floor when the floor has no saved plan. */
 const robotMaps = ref<Record<string, Array<Record<string, any>>>>({});
 watch(ids, async (list) => {
@@ -346,7 +359,8 @@ const shapes = computed<TEditorShape[]>(() => shapesFromMap(map.value));
 const robotFloorMaps = computed(() => {
   const all: TRobotMapView[] = [];
   for (const id of ids.value) {
-    for (const m of robotMapViews(robotMaps.value[id], states.value[id]?.mapId ?? null, routes.value[id] ?? [])) {
+    const site = { key: (n: number) => siteFloorKey(siteFloors.value, id, n), name: levelName };
+    for (const m of robotMapViews(robotMaps.value[id], states.value[id]?.mapId ?? null, routes.value[id] ?? [], site)) {
       const i = all.findIndex((x) => x.mapId === m.mapId);
       if (i < 0) all.push(m);
       else if (m.current) all[i] = { ...all[i]!, current: true };
@@ -364,7 +378,7 @@ const floorRoutes = (floorNo: number) => {
   for (const id of ids.value) {
     const st = states.value[id];
     for (const r of routes.value[id] ?? []) {
-      const f = r.floorNo ?? (st?.floorKnown ? st.floorNo : null);
+      const f = r.floorNo !== null && r.floorNo !== undefined ? siteFloorKey(siteFloors.value, id, r.floorNo) : siteFloorOf(st);
       if (f === floorNo && !seen.has(r.id)) seen.set(r.id, r);
     }
   }

package/components/Robot/Detail.vue

@@ -336,6 +336,7 @@ import RobotEmergencyStop from "./EmergencyStop.vue";
 import RobotSetupPanel from "./SetupPanel.vue";
 import { faultPhotos } from "../../utils/robot-control";
 import { cleanAreaChoices, cleanAreaCommand, mapLayerLegend, robotMapDefault, robotMapViews } from "../../utils/robot-maps";
+import { siteFloorKey, siteFloorLabel, type TSiteFloor } from "../../utils/robot-floors";
 import useRobotLive, { siteStatesFeed } from "../../composables/useRobotLive";
 import {
   attentionText,
@@ -435,6 +436,7 @@ const {
   deleteRobot,
   getRobotMaps,
   getRobotMapImages,
+  getSiteFloors,
   resolveRobotAlerts,
   getPatrolHistory,
   getSiteFaults,
@@ -626,7 +628,24 @@ async function loadSchedule() {
 
 /* ---- the robot's own maps (PadBot: one per floor / area): a selector, opening where the robot is ---- */
 const mapItems = ref<Array<Record<string, any>>>([]);
-const mapViews = computed(() => robotMapViews(mapItems.value, live.value?.mapId ?? null, patrol.value?.routes ?? []));
+/** The site's floor names: this robot's map floors are shown as the site calls them (the PadBot's 3 = "34"). */
+const siteFloors = ref<TSiteFloor[]>([]);
+watch(
+  () => String(record.value?.site?._id ?? ""),
+  async (site) => {
+    siteFloors.value = [];
+    if (!site) return;
+    const res = await getSiteFloors(site).catch(() => null);
+    if (site === String(record.value?.site?._id ?? "")) siteFloors.value = res?.floors ?? [];
+  },
+  { immediate: true },
+);
+const mapViews = computed(() =>
+  robotMapViews(mapItems.value, live.value?.mapId ?? null, patrol.value?.routes ?? [], {
+    key: (n) => siteFloorKey(siteFloors.value, props.robotId, n),
+    name: (key) => siteFloorLabel(siteFloors.value, key, live.value ? { [props.robotId]: live.value } : {}),
+  }),
+);
 const selectedMapId = ref<string | null>(null);
 const selectedMap = computed(() => mapViews.value.find((m) => m.mapId === selectedMapId.value) ?? null);
 const mapLegend = computed(() => mapLayerLegend(selectedMap.value));

package/components/Robot/MiniMap.vue

@@ -63,12 +63,12 @@
 import { computed, ref, watch } from "vue";
 import { routeOverlay } from "../../utils/rmf-editor";
 import { robotMapViews, type TRobotMapView } from "../../utils/robot-maps";
+import { siteFloorKey, siteFloorLabel, type TSiteFloor } from "../../utils/robot-floors";
 import RobotFloorPlan from "./FloorPlan.vue";
 import RobotPatrolRoutes from "./PatrolRoutes.vue";
 import RobotReconnecting from "./Reconnecting.vue";
 import {
   brandName,
-  floorLabel,
   mapFloors,
   mapRobots,
   nameTagSide,
@@ -76,6 +76,7 @@ import {
   positionGap,
   positionGapText,
   robotStatus,
+  siteFloorOf,
   unplacedRobots,
   unplacedText,
   type TLiveRobotState,
@@ -100,8 +101,10 @@ const props = withDefaults(
     map?: Record<string, any> | null;
     /** Each robot's own maps (`/robots/:id/maps` items) by robot id - PadBot's map images and a map selector. */
     robotMaps?: Record<string, Array<Record<string, any>>>;
+    /** The site's floor names (`/robots/sites/:site/floors`): robot maps and routes are put on the SITE floor (the PadBot's 3 = 34). */
+    siteFloors?: TSiteFloor[];
   }>(),
-  { type: "cleaning", routes: () => ({}), connected: true, brands: () => [], tickMs: 4000, map: null, robotMaps: () => ({}) },
+  { type: "cleaning", routes: () => ({}), connected: true, brands: () => [], tickMs: 4000, map: null, robotMaps: () => ({}), siteFloors: () => [] },
 );
 const emit = defineEmits<{ open: [id: string] }>();
 
@@ -111,7 +114,8 @@ const ids = computed(() => props.rows.map((r) => String(r._id)));
 const allMaps = computed(() => {
   const seen = new Map<string, TRobotMapView>();
   for (const id of ids.value) {
-    for (const m of robotMapViews(props.robotMaps[id], props.states[id]?.mapId ?? null, props.routes[id] ?? [])) {
+    const site = { key: (n: number) => siteFloorKey(props.siteFloors, id, n), name: floorName };
+    for (const m of robotMapViews(props.robotMaps[id], props.states[id]?.mapId ?? null, props.routes[id] ?? [], site)) {
       const had = seen.get(m.mapId);
       seen.set(m.mapId, had ? { ...had, current: had.current || m.current } : m);
     }
@@ -142,7 +146,9 @@ const robots = computed(() =>
 const overlay = computed(() => (floor.value === null ? { lanes: [], waypoints: [], fiducials: [] } : routeOverlay(props.map, floor.value)));
 const hasRoutes = computed(() => !!props.map && (props.map.rmf?.levels ?? props.map.levels ?? []).some((l: any) => (l.lanes ?? []).length));
 const showRoutes = ref(true);
-const floorName = (f: number) => floorLabel({ floorNo: f, floorKnown: true });
+function floorName(f: number) {
+  return siteFloorLabel(props.siteFloors, f, props.states);
+}
 
 /** The routes walked on this floor, once each. A route with no floor is drawn on its robot's floor. */
 const floorRoutes = computed(() => {
@@ -150,7 +156,7 @@ const floorRoutes = computed(() => {
   for (const id of ids.value) {
     const st = props.states[id];
     for (const r of props.routes[id] ?? []) {
-      const f = r.floorNo ?? (st?.floorKnown ? st.floorNo : null);
+      const f = r.floorNo !== null && r.floorNo !== undefined ? siteFloorKey(props.siteFloors, id, r.floorNo) : siteFloorOf(st);
       const onMap = !shownMap.value || !r.mapId || r.mapId === shownMap.value.mapId;
       if ((r.mapId && shownMap.value ? onMap : f === floor.value) && !seen.has(r.id)) seen.set(r.id, r);
     }

package/components/Robot/SiteFleet.vue

@@ -81,6 +81,7 @@
         :connected="connected"
         :brands="brands"
         :map="routeMap"
+        :site-floors="siteFloors"
         @open="onMapOpen"
       />
     </aside>
@@ -101,6 +102,7 @@ import RobotBattery from "./Battery.vue";
 import RobotFloorLabel from "./FloorLabel.vue";
 import RobotFaultBadge from "./FaultBadge.vue";
 import RobotMiniMap from "./MiniMap.vue";
+import type { TSiteFloor } from "../../utils/robot-floors";
 import useRobotLive, { siteStatesFeed } from "../../composables/useRobotLive";
 import {
   agoText,
@@ -144,7 +146,18 @@ const emit = defineEmits<{
   status: [status: { connected: boolean; faults: number; siteName: string; clientName: string }];
 }>();
 
-const { getSiteFleet, getSiteSummary, getRobotBrands, getPatrolRoutes, getRobotMaps, listSiteBuildingMaps, getBuildingMap, getFleetCoreBuilding } = useRobots();
+const { getSiteFleet, getSiteSummary, getRobotBrands, getPatrolRoutes, getRobotMaps, listSiteBuildingMaps, getBuildingMap, getFleetCoreBuilding, getSiteFloors } = useRobots();
+/** The site's floor names: the robots' own maps and routes go on the site floor (the PadBot's 3 = 34). None saved / not readable = robot numbers as before. */
+const siteFloors = ref<TSiteFloor[]>([]);
+watch(
+  () => props.site,
+  async (site) => {
+    siteFloors.value = [];
+    const res = await getSiteFloors(site).catch(() => null);
+    if (site === props.site) siteFloors.value = res?.floors ?? [];
+  },
+  { immediate: true },
+);
 
 /**
  * The site's building for the mini-map's robot lanes: the live HERO Fleet

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.97.1-staging.607",
+  "version": "4.97.1-staging.608",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",

package/utils/robot-display.ts

@@ -637,6 +637,10 @@ export type TLiveRobotState = {
   batteryPercent?: number | null;
   floorNo?: number | null;
   floorKnown?: boolean;
+  /** The SITE's floor for `floorNo` (server, from the site's floor names): the PadBot's 3 is the 34th floor. */
+  siteFloorNo?: number | null;
+  /** The site's name for that floor (what the lift car display shows). */
+  floorName?: string | null;
   /** The brand's id of the map the robot is on now (PadBot); absent / null when unknown. */
   mapId?: string | null;
   position?: { x: number; y: number; theta: number } | null;
@@ -852,6 +856,13 @@ export function headingDeg(state: { position?: { theta?: unknown } | null } | nu
   return Math.round(((((-t * 180) / Math.PI) % 360) + 360) % 360);
 }
 
+/** The site floor a robot is on: the server's site floor, else its own number (no floor names saved). */
+export function siteFloorOf(live: Partial<TLiveRobotState> | null | undefined): number | null {
+  if (!live || live.floorKnown !== true) return null;
+  if (finite(live.siteFloorNo) && Number.isInteger(live.siteFloorNo)) return live.siteFloorNo;
+  return finite(live.floorNo) ? live.floorNo : null;
+}
+
 /** Is the robot live on a known floor with a plan position - i.e. may it be drawn? */
 function placeable(live: TLiveRobotState | null | undefined) {
   return !!live?.ok && live.online !== false && live.floorKnown === true && finite(live.floorNo) && !!planPoint(live as any);
@@ -862,7 +873,8 @@ export function mapFloors(ids: string[], states: Record<string, TLiveRobotState>
   const floors = new Set<number>();
   for (const id of ids) {
     const s = states[id];
-    if (s?.ok && s.floorKnown === true && finite(s.floorNo)) floors.add(s.floorNo);
+    const f = s?.ok ? siteFloorOf(s) : null;
+    if (f !== null) floors.add(f);
   }
   return [...floors].sort((a, b) => a - b);
 }
@@ -877,7 +889,7 @@ export function pickFloor(floors: number[], chosen: unknown, ids: string[], stat
   let best = floors[0]!;
   let most = -1;
   for (const f of floors) {
-    const n = ids.filter((id) => placeable(states[id]) && states[id]!.floorNo === f).length;
+    const n = ids.filter((id) => placeable(states[id]) && siteFloorOf(states[id]) === f).length;
     if (n > most) {
       most = n;
       best = f;
@@ -896,7 +908,7 @@ export function mapRobots(
   return rows.flatMap((r) => {
     const id = String(r?._id ?? "");
     const live = states[id];
-    if (!placeable(live) || live!.floorNo !== floor) return [];
+    if (!placeable(live) || siteFloorOf(live) !== floor) return [];
     const at = planPoint(live as any)!;
     // A kept (stale) reading is drawn faded with "last seen N s ago" - never as live.
     return [{ id, name: String(r.name ?? ""), mode: live!.mode, type: r.type as string, ...at, rot: `rotate(${headingDeg(live)}deg)`, stale: live!.stale === true, seen: staleText(live) }];

package/utils/robot-floors.ts

@@ -8,6 +8,8 @@
  * arithmetic only.
  */
 
+import { siteFloorOf, type TLiveRobotState } from "./robot-display.ts";
+
 export type TFloorLink = { robotId: string; floorNo: number };
 export type TSiteFloor = { key: number; name: string; vendor?: TFloorLink[]; fleetCoreLevel?: string };
 
@@ -93,3 +95,23 @@ export function floorsBody(floors: TSiteFloor[]): TSiteFloor[] {
 export function floorNameByKey(floors: TSiteFloor[] | null | undefined, key: number): string {
   return floors?.find((f) => f.key === key)?.name ?? defaultFloorName(key);
 }
+
+/**
+ * A robot's own floor number as the site floor (same rule as core
+ * `siteFloorOf`): its link, else the floor with that number, else its own
+ * number unchanged. Used for a robot's maps and routes, which carry the
+ * robot's number (the PadBot's map says 3 on the 34th floor).
+ */
+export function siteFloorKey(floors: TSiteFloor[] | null | undefined, robotId: string, floorNo: number): number {
+  return floorKeyFor(floors ?? [], robotId, floorNo) ?? floorNo;
+}
+
+/**
+ * A site floor's name for the maps: the saved list's name, else the name the
+ * server sent with a robot on that floor, else the old label (34 -> "L34").
+ */
+export function siteFloorLabel(floors: TSiteFloor[] | null | undefined, key: number, states: Record<string, TLiveRobotState> = {}): string {
+  if (floors?.some((f) => f.key === key)) return floorNameByKey(floors, key);
+  const named = Object.values(states).find((s) => s?.ok && siteFloorOf(s) === key && typeof s.floorName === "string" && s.floorName.trim());
+  return named ? String(named.floorName).trim() : defaultFloorName(key);
+}

package/utils/robot-maps.ts

@@ -62,7 +62,7 @@ export function mapLayerLegend(view: Pick<TRobotMapView, "zones" | "taughtRoute"
 }
 
 const isNum = (v: unknown): v is number => typeof v === "number" && Number.isFinite(v);
-const levelName = (n: number) => (n > 0 ? `L${n}` : n < 0 ? `B${-n}` : "G");
+const defaultLevelName = (n: number) => (n > 0 ? `L${n}` : n < 0 ? `B${-n}` : "G");
 const TYPE_WORDS: Readonly<Record<number, string>> = { 0: "Point", 3: "Lift", 4: "Loading", 6: "Access door", 10: "Charging" };
 
 /**
@@ -91,10 +91,13 @@ export function robotMapViews(
   items: Array<Record<string, any>> | null | undefined,
   currentMapId: string | null | undefined,
   routes: Array<{ name?: string; mapId?: string }> | null | undefined = [],
+  /** The site's floors for this robot: its map floor numbers become site floors, named as the lift shows them. */
+  site?: { key: (floorNo: number) => number; name: (key: number) => string },
 ): TRobotMapView[] {
   const list = (Array.isArray(items) ? items : []).filter((m) => typeof m?.mapId === "string" && m.mapId && typeof m?.imageUrl === "string");
   return list.map((m, i) => {
-    const floorNo = Number.isInteger(m.floor) ? (m.floor as number) : null;
+    const floorNo = Number.isInteger(m.floor) ? (site ? site.key(m.floor) : (m.floor as number)) : null;
+    const levelName = site ? site.name : defaultLevelName;
     const routeNames = (routes ?? []).filter((r) => r?.mapId === m.mapId && r.name).map((r) => String(r.name));
     const shown = typeof m.mapDisplayName === "string" ? m.mapDisplayName.trim() : "";
     const hint = floorNo !== null ? levelName(floorNo) : routeNames[0]?.replace(/ \(default\)$/, "") ?? "";