@pascal-app/editor 1.1.0 → 1.1.2

package/src/components/viewer/floorplan-preview-geometry.ts

@@ -1,281 +0,0 @@
-import type { FloorplanGeometry, FloorplanPoint } from '@pascal-app/core'
-
-export type FloorplanBounds = {
-  minX: number
-  minY: number
-  maxX: number
-  maxY: number
-}
-
-export type FloorplanViewBox = { x: number; y: number; width: number; height: number }
-
-export type FloorplanViewport = {
-  left: number
-  top: number
-  width: number
-  height: number
-}
-
-type PlanTransform = { tx: number; ty: number; rotation: number }
-
-const IDENTITY: PlanTransform = { tx: 0, ty: 0, rotation: 0 }
-const MIN_VIEWBOX_SIZE = 0.25
-const MAX_VIEWBOX_SIZE = 500
-
-function clientToViewBoxFraction(
-  viewBox: FloorplanViewBox,
-  viewport: FloorplanViewport,
-  clientX: number,
-  clientY: number,
-): FloorplanPoint {
-  const viewportWidth = Math.max(viewport.width, 1)
-  const viewportHeight = Math.max(viewport.height, 1)
-  const scale = Math.min(viewportWidth / viewBox.width, viewportHeight / viewBox.height)
-  const renderedWidth = viewBox.width * scale
-  const renderedHeight = viewBox.height * scale
-  const renderedLeft = viewport.left + (viewportWidth - renderedWidth) / 2
-  const renderedTop = viewport.top + (viewportHeight - renderedHeight) / 2
-  return [(clientX - renderedLeft) / renderedWidth, (clientY - renderedTop) / renderedHeight]
-}
-
-export function clientToFloorplanPoint(
-  viewBox: FloorplanViewBox,
-  viewport: FloorplanViewport,
-  clientX: number,
-  clientY: number,
-): FloorplanPoint {
-  const [fractionX, fractionY] = clientToViewBoxFraction(viewBox, viewport, clientX, clientY)
-  return [viewBox.x + fractionX * viewBox.width, viewBox.y + fractionY * viewBox.height]
-}
-
-export function scaleFloorplanViewBox(
-  viewBox: FloorplanViewBox,
-  factor: number,
-  anchorX = 0.5,
-  anchorY = 0.5,
-): FloorplanViewBox {
-  const minFactor = Math.max(MIN_VIEWBOX_SIZE / viewBox.width, MIN_VIEWBOX_SIZE / viewBox.height)
-  const maxFactor = Math.min(MAX_VIEWBOX_SIZE / viewBox.width, MAX_VIEWBOX_SIZE / viewBox.height)
-  const clampedFactor = Math.min(Math.max(factor, minFactor), maxFactor)
-  const width = viewBox.width * clampedFactor
-  const height = viewBox.height * clampedFactor
-  return {
-    x: viewBox.x + (viewBox.width - width) * anchorX,
-    y: viewBox.y + (viewBox.height - height) * anchorY,
-    width,
-    height,
-  }
-}
-
-export function scaleFloorplanViewBoxBetweenClients(
-  viewBox: FloorplanViewBox,
-  factor: number,
-  viewport: FloorplanViewport,
-  sourceClient: FloorplanPoint,
-  targetClient: FloorplanPoint,
-): FloorplanViewBox {
-  const sourcePoint = clientToFloorplanPoint(viewBox, viewport, sourceClient[0], sourceClient[1])
-  const [targetX, targetY] = clientToViewBoxFraction(
-    viewBox,
-    viewport,
-    targetClient[0],
-    targetClient[1],
-  )
-  const scaled = scaleFloorplanViewBox(viewBox, factor, 0, 0)
-  return {
-    ...scaled,
-    x: sourcePoint[0] - targetX * scaled.width,
-    y: sourcePoint[1] - targetY * scaled.height,
-  }
-}
-
-export function panFloorplanViewBox(
-  viewBox: FloorplanViewBox,
-  viewport: FloorplanViewport,
-  sourceClient: FloorplanPoint,
-  targetClient: FloorplanPoint,
-): FloorplanViewBox {
-  const sourcePoint = clientToFloorplanPoint(viewBox, viewport, sourceClient[0], sourceClient[1])
-  const targetPoint = clientToFloorplanPoint(viewBox, viewport, targetClient[0], targetClient[1])
-  return {
-    ...viewBox,
-    x: viewBox.x + sourcePoint[0] - targetPoint[0],
-    y: viewBox.y + sourcePoint[1] - targetPoint[1],
-  }
-}
-
-function applyTransform(point: FloorplanPoint, transform: PlanTransform): FloorplanPoint {
-  const cos = Math.cos(transform.rotation)
-  const sin = Math.sin(transform.rotation)
-  return [
-    point[0] * cos - point[1] * sin + transform.tx,
-    point[0] * sin + point[1] * cos + transform.ty,
-  ]
-}
-
-function composeTransform(
-  parent: PlanTransform,
-  child: NonNullable<Extract<FloorplanGeometry, { kind: 'group' }>['transform']>,
-): PlanTransform {
-  const translated = applyTransform(child.translate ?? [0, 0], parent)
-  return {
-    tx: translated[0],
-    ty: translated[1],
-    rotation: parent.rotation + (child.rotate ?? 0),
-  }
-}
-
-function includePoint(bounds: FloorplanBounds | null, point: FloorplanPoint): FloorplanBounds {
-  if (!bounds) return { minX: point[0], minY: point[1], maxX: point[0], maxY: point[1] }
-  return {
-    minX: Math.min(bounds.minX, point[0]),
-    minY: Math.min(bounds.minY, point[1]),
-    maxX: Math.max(bounds.maxX, point[0]),
-    maxY: Math.max(bounds.maxY, point[1]),
-  }
-}
-
-function includePoints(
-  bounds: FloorplanBounds | null,
-  points: readonly FloorplanPoint[],
-  transform: PlanTransform,
-): FloorplanBounds | null {
-  let next = bounds
-  for (const point of points) next = includePoint(next, applyTransform(point, transform))
-  return next
-}
-
-function geometryBounds(
-  geometry: FloorplanGeometry,
-  transform: PlanTransform,
-  bounds: FloorplanBounds | null,
-): FloorplanBounds | null {
-  switch (geometry.kind) {
-    case 'group': {
-      const nextTransform = geometry.transform
-        ? composeTransform(transform, geometry.transform)
-        : transform
-      return geometry.children.reduce(
-        (next, child) => geometryBounds(child, nextTransform, next),
-        bounds,
-      )
-    }
-    case 'polygon':
-    case 'polyline':
-    case 'hatch':
-      return includePoints(bounds, geometry.points, transform)
-    case 'rect':
-      return includePoints(
-        bounds,
-        [
-          [geometry.x, geometry.y],
-          [geometry.x + geometry.width, geometry.y],
-          [geometry.x + geometry.width, geometry.y + geometry.height],
-          [geometry.x, geometry.y + geometry.height],
-        ],
-        transform,
-      )
-    case 'circle': {
-      const center = applyTransform([geometry.cx, geometry.cy], transform)
-      return includePoints(
-        bounds,
-        [
-          [center[0] - geometry.r, center[1] - geometry.r],
-          [center[0] + geometry.r, center[1] + geometry.r],
-        ],
-        IDENTITY,
-      )
-    }
-    case 'line':
-    case 'hit-line':
-    case 'edge-handle':
-      return includePoints(
-        bounds,
-        [
-          [geometry.x1, geometry.y1],
-          [geometry.x2, geometry.y2],
-        ],
-        transform,
-      )
-    case 'text':
-      return includePoint(bounds, applyTransform([geometry.x, geometry.y], transform))
-    case 'image': {
-      const halfWidth = geometry.width / 2
-      const halfHeight = geometry.height / 2
-      const imageTransform = composeTransform(transform, {
-        translate: geometry.center,
-        rotate: geometry.rotation,
-      })
-      return includePoints(
-        bounds,
-        [
-          [-halfWidth, -halfHeight],
-          [halfWidth, -halfHeight],
-          [halfWidth, halfHeight],
-          [-halfWidth, halfHeight],
-        ],
-        imageTransform,
-      )
-    }
-    case 'endpoint-handle':
-    case 'midpoint-handle':
-    case 'move-handle':
-    case 'move-arrow':
-    case 'rotate-arrow':
-    case 'equal-spacing-badge':
-      return includePoint(bounds, applyTransform(geometry.point, transform))
-    case 'dimension-label':
-      return includePoint(bounds, applyTransform([geometry.cx, geometry.cy], transform))
-    case 'dimension':
-      return includePoints(
-        bounds,
-        [
-          geometry.start,
-          geometry.end,
-          geometry.dimensionStart ?? geometry.start,
-          geometry.dimensionEnd ?? geometry.end,
-        ],
-        transform,
-      )
-    case 'dimension-string':
-      return geometry.segments.reduce(
-        (next, segment) =>
-          includePoints(
-            next,
-            [
-              segment.start,
-              segment.end,
-              segment.dimensionStart ?? segment.start,
-              segment.dimensionEnd ?? segment.end,
-            ],
-            transform,
-          ),
-        bounds,
-      )
-    case 'path':
-      return bounds
-    default:
-      return bounds
-  }
-}
-
-export function getFloorplanBounds(
-  geometries: readonly FloorplanGeometry[],
-): FloorplanBounds | null {
-  return geometries.reduce(
-    (bounds, geometry) => geometryBounds(geometry, IDENTITY, bounds),
-    null as FloorplanBounds | null,
-  )
-}
-
-export function padFloorplanBounds(bounds: FloorplanBounds, ratio = 0.12): FloorplanBounds {
-  const width = Math.max(bounds.maxX - bounds.minX, 1)
-  const height = Math.max(bounds.maxY - bounds.minY, 1)
-  const padding = Math.max(Math.max(width, height) * ratio, 0.75)
-  return {
-    minX: bounds.minX - padding,
-    minY: bounds.minY - padding,
-    maxX: bounds.maxX + padding,
-    maxY: bounds.maxY + padding,
-  }
-}

package/src/components/viewer/floorplan-preview-navigation.test.ts

@@ -1,43 +0,0 @@
-import { describe, expect, test } from 'bun:test'
-import {
-  cameraAzimuthFromFloorplanRotation,
-  floorplanRotationFromCameraAzimuth,
-  floorplanViewBoxFromNavigationPose,
-  nearestEquivalentDegrees,
-  visibleFloorplanViewWidth,
-} from './floorplan-preview-navigation'
-
-describe('floorplan preview navigation', () => {
-  test('keeps continuous compass rotations across the angle seam', () => {
-    expect(nearestEquivalentDegrees(-179, 179)).toBe(181)
-    expect(floorplanRotationFromCameraAzimuth((-179 * Math.PI) / 180, 179)).toBeCloseTo(181)
-  })
-
-  test('uses the same north-up azimuth convention as the editor', () => {
-    expect(cameraAzimuthFromFloorplanRotation(0)).toBe(0)
-    expect(cameraAzimuthFromFloorplanRotation(90)).toBeCloseTo(Math.PI / 2)
-  })
-
-  test('maps a camera pose to an aspect-correct centered view box', () => {
-    expect(
-      floorplanViewBoxFromNavigationPose(
-        {
-          source: '3d',
-          revision: 1,
-          target: [0, 0, 0],
-          azimuth: 0,
-          viewWidth: 20,
-        },
-        { x: 4, y: 3 },
-        0,
-        { width: 1000, height: 500 },
-      ),
-    ).toEqual({ x: -6, y: -2, width: 20, height: 10 })
-  })
-
-  test('reports the actual horizontal span for meet-preserved SVG view boxes', () => {
-    expect(
-      visibleFloorplanViewWidth({ x: 0, y: 0, width: 10, height: 10 }, { width: 200, height: 100 }),
-    ).toBe(20)
-  })
-})

package/src/components/viewer/floorplan-preview-navigation.ts

@@ -1,62 +0,0 @@
-import type { NavigationSyncPose } from '../../store/use-editor'
-import type { FloorplanViewBox } from './floorplan-preview-geometry'
-
-export type FloorplanPreviewViewportSize = {
-  width: number
-  height: number
-}
-
-export function nearestEquivalentDegrees(angle: number, reference: number) {
-  let next = angle
-  while (next - reference > 180) next -= 360
-  while (next - reference < -180) next += 360
-  return next
-}
-
-export function floorplanRotationFromCameraAzimuth(azimuth: number, reference: number) {
-  return nearestEquivalentDegrees((azimuth * 180) / Math.PI, reference)
-}
-
-export function cameraAzimuthFromFloorplanRotation(rotationDeg: number) {
-  return (rotationDeg * Math.PI) / 180
-}
-
-export function rotateFloorplanPoint(
-  point: { x: number; y: number },
-  rotationDeg: number,
-): { x: number; y: number } {
-  if (rotationDeg === 0) return point
-  const radians = (rotationDeg * Math.PI) / 180
-  const cos = Math.cos(radians)
-  const sin = Math.sin(radians)
-  return {
-    x: point.x * cos - point.y * sin,
-    y: point.x * sin + point.y * cos,
-  }
-}
-
-export function visibleFloorplanViewWidth(
-  viewBox: FloorplanViewBox,
-  viewport: FloorplanPreviewViewportSize,
-) {
-  const aspect = Math.max(viewport.width, 1) / Math.max(viewport.height, 1)
-  return Math.max(viewBox.width, viewBox.height * aspect)
-}
-
-export function floorplanViewBoxFromNavigationPose(
-  pose: NavigationSyncPose,
-  localCenter: { x: number; y: number },
-  sceneRotationDeg: number,
-  viewport: FloorplanPreviewViewportSize,
-): FloorplanViewBox {
-  const center = rotateFloorplanPoint(localCenter, sceneRotationDeg)
-  const aspect = Math.max(viewport.width, 1) / Math.max(viewport.height, 1)
-  const width = Math.max(pose.viewWidth, 0.001)
-  const height = width / aspect
-  return {
-    x: center.x - width / 2,
-    y: center.y - height / 2,
-    width,
-    height,
-  }
-}

package/src/components/viewer/floorplan-preview-visibility.test.ts

@@ -1,35 +0,0 @@
-import { describe, expect, test } from 'bun:test'
-import type { AnyNode } from '@pascal-app/core'
-import { isVisibleInFloorplan } from './floorplan-preview-visibility'
-
-const node = (id: string, type: string, parentId: string | null, visible = true) =>
-  ({ object: 'node', id, type, parentId, visible, metadata: {} }) as unknown as AnyNode
-
-describe('isVisibleInFloorplan', () => {
-  test('a hidden Site keeps the buildings on it in the plan', () => {
-    const nodes: Record<string, AnyNode> = {
-      site_a: node('site_a', 'site', null, false),
-      building_a: node('building_a', 'building', 'site_a'),
-      level_a: node('level_a', 'level', 'building_a'),
-      wall_a: node('wall_a', 'wall', 'level_a'),
-      wall_b: node('wall_b', 'wall', 'level_a', false),
-    }
-    expect(isVisibleInFloorplan(nodes.wall_a!, nodes)).toBe(true)
-    expect(isVisibleInFloorplan(nodes.wall_b!, nodes)).toBe(false)
-    expect(isVisibleInFloorplan(nodes.site_a!, nodes)).toBe(false)
-  })
-
-  test('a hidden building or level still hides its subtree', () => {
-    const nodes: Record<string, AnyNode> = {
-      site_a: node('site_a', 'site', null),
-      building_a: node('building_a', 'building', 'site_a', false),
-      level_a: node('level_a', 'level', 'building_a'),
-      wall_a: node('wall_a', 'wall', 'level_a'),
-      building_b: node('building_b', 'building', 'site_a'),
-      level_b: node('level_b', 'level', 'building_b', false),
-      wall_b: node('wall_b', 'wall', 'level_b'),
-    }
-    expect(isVisibleInFloorplan(nodes.wall_a!, nodes)).toBe(false)
-    expect(isVisibleInFloorplan(nodes.wall_b!, nodes)).toBe(false)
-  })
-})

package/src/components/viewer/floorplan-preview-visibility.ts

@@ -1,19 +0,0 @@
-import { type AnyNode, hidesDescendants } from '@pascal-app/core'
-
-/**
- * A node draws in the plan unless it, or an ancestor whose flag reaches its
- * descendants, is hidden. A hidden Site keeps its buildings on the plan; see
- * `hidesDescendants`.
- */
-export function isVisibleInFloorplan(node: AnyNode, nodes: Record<string, AnyNode>): boolean {
-  if (node.visible === false) return false
-  const seen = new Set<string>([node.id])
-  let current: AnyNode | undefined = node.parentId ? nodes[node.parentId] : undefined
-  while (current) {
-    if (seen.has(current.id)) return true
-    seen.add(current.id)
-    if (current.visible === false && hidesDescendants(current)) return false
-    current = current.parentId ? nodes[current.parentId] : undefined
-  }
-  return true
-}