@7365admin1/layer-common 4.49.0 → 4.51.0

package/utils/robot-floorplan.ts

@@ -4,9 +4,11 @@
  * components only draw what these return.
  *
  * A floor plan is an image stored privately in the building map (never the
- * public file store) and placed in the HERO plan frame (40 x 26 m, the same
- * frame every drawn wall, door and lift uses): its top-left corner at
- * (`tx`, `ty`) metres, `metersPerPixel` from a measured distance.
+ * public file store): its top-left corner at world (`tx`, -`ty`) metres (for
+ * a map drawn in the old 40 x 26 m frame: simply metres from the plan's
+ * top-left), `metersPerPixel` from a measured distance, turned `yawRad`.
+ * The editor's own placement maths is in `rmf-editor.ts` (any frame size);
+ * `planBox` / `fitPlan` here keep the 40 x 26 m frame for older callers.
  */
 
 /** The HERO plan frame - `utils/robot-building.ts` PLAN_W_M / PLAN_H_M (decision 30). */
@@ -18,7 +20,7 @@ export const FLOOR_PLAN_MAX_BYTES = 1_000_000;
 export const FLOOR_PLAN_MAX_PX = 2400;
 export const FLOOR_PLAN_TYPES = ["image/png", "image/jpeg", "image/webp"];
 
-export type TFloorPlan = { floorNo: number; widthPx: number; heightPx: number; metersPerPixel: number; tx: number; ty: number; updatedAt?: string };
+export type TFloorPlan = { floorNo: number; widthPx: number; heightPx: number; metersPerPixel: number; tx: number; ty: number; yawRad?: number; updatedAt?: string };
 export type TPlanPoint = { x: number; y: number };
 
 const r6 = (v: number) => Math.round(v * 1e6) / 1e6;
@@ -70,14 +72,13 @@ export function rescaleByMeasure(p: TFloorPlan, a: TPlanPoint, b: TPlanPoint, re
   return { plan: { ...p, metersPerPixel } };
 }
 
-/** "1 px = 4.2 cm · plan 33.6 x 25.2 m" */
-export function scaleText(p: TFloorPlan | null) {
+/** "1 px = 4.2 cm · plan 33.6 x 25.2 m" - the drawing area grows to take in a bigger plan, so nothing is cut off. */
+export function scaleText(p: Pick<TFloorPlan, "widthPx" | "heightPx" | "metersPerPixel"> | null) {
   if (!p) return "";
   const cm = p.metersPerPixel * 100;
   const w = p.widthPx * p.metersPerPixel;
   const h = p.heightPx * p.metersPerPixel;
-  const big = w > FRAME_W_M + 0.05 || h > FRAME_H_M + 0.05;
-  return `1 px = ${cm >= 10 ? cm.toFixed(0) : cm.toFixed(1)} cm · plan ${w.toFixed(1)} × ${h.toFixed(1)} m${big ? " (larger than the 40 × 26 m drawing area - the edge is cut off)" : ""}`;
+  return `1 px = ${cm >= 10 ? cm.toFixed(0) : cm.toFixed(1)} cm · plan ${w.toFixed(1)} × ${h.toFixed(1)} m`;
 }
 
 /** Plain-language reason a picked file cannot be used, or null. */

package/utils/role.ts

@@ -60,3 +60,16 @@ export function memberRoleChip(item: {
       return name ? { text: name, tone: "info" } : null;
   }
 }
+
+/**
+ * The Members banner (owner decision 2026-09-25: keep the warning, companies
+ * re-assign a role for the right site, nobody's access is cut). `null` at 0 so
+ * the banner disappears once every member here has this site's role.
+ */
+export function otherSiteBannerText(count: unknown): string | null {
+  const n = typeof count === "number" && Number.isFinite(count) ? Math.floor(count) : 0;
+  if (n <= 0) return null;
+  return n === 1
+    ? "1 member here has a role from another site. Assign them a role for this site."
+    : `${n} members here have a role from another site. Assign each one a role for this site.`;
+}