* feat: add persistent measurement tools * feat: make measurements associative * fix: finish measurements with Escape * feat: improve measurement snapping guides * feat: clarify measurement axis feedback * feat: smart measure lens, zone reports, and direct measurement editing - Smart measurement lens: registry-owned wall/slab/zone hover reports with a single top-center HUD, click-to-pin, latest-event back pressure, and no scene writes - Conservative derived zone quantities (footprint, perimeter, proven enclosure, gross wall/floor surface, flat-room volume) with the selected-zone blueprint panel - Direct editing of committed measurements via selected-only 2D/3D vertex affordances with midpoint insertion, cancellation, and one-write history - Shared measurement surface-query session; 2D tracing joins the slab/ceiling magnetic pipeline with registered-corner snapping - Angle arcs on the smaller angle, indigo active/black resting hierarchy, screen-sized normal-aligned contact rings Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: make measurement snapping always magnetic Measurement drafting and committed-edit paths gated wall, semantic, and axis magnetism on isMagneticSnapActive(), which is only true in the 'lines' snapping mode — in the default 'grid' mode corners and wall intersections barely attracted (3D association fell to the 0.012 m verify tolerance, 2D wall radii to the 0.05 m connect stick). Measurement is an analysis tool whose anchors exist to bind real geometry, so its snapping no longer consults the construction snapping-mode chip: 2D/3D drafting and committed vertex edits are always magnetic, Alt is the temporary bypass in both views (releasing the axis pull, wall magnetism, and the 2D projected-geometry pull, and shrinking association to contact tolerance). A discrete 2D wall snap (endpoint / midpoint / crossing) now outranks the locked axis pull, and committed 2D edits route the fallback through the raw pointer so free drags no longer quantize to the construction grid. Volume extrusion height keeps its mode-driven grid quantize. Codex adversarial review confirmed the diagnosis and plumbing; its 2D Alt-depth and grid-quantize findings are applied. New surface-plan-snap tests pin the magnetic override seam. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(measurement): stabilize area surface intent --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
251 lines
7.6 KiB
TypeScript
251 lines
7.6 KiB
TypeScript
import { describe, expect, test } from 'bun:test'
|
|
import { type FloorplanGeometry, type GeometryContext, MeasurementNode } from '@pascal-app/core'
|
|
import { MEASUREMENT_ACTIVE_COLOR, MEASUREMENT_FLOORPLAN_COLOR } from '@pascal-app/editor'
|
|
import { buildMeasurementFloorplan } from './floorplan'
|
|
|
|
const palette = {
|
|
selectedStroke: '#2563eb',
|
|
selectedFill: '#dbeafe',
|
|
selectedHatch: '#93c5fd',
|
|
wallHoverStroke: '#60a5fa',
|
|
endpointHandleFill: '#f97316',
|
|
endpointHandleStroke: '#ffffff',
|
|
endpointHandleHoverStroke: '#fdba74',
|
|
endpointHandleActiveFill: '#ea580c',
|
|
endpointHandleActiveStroke: '#ffffff',
|
|
curveHandleFill: '#14b8a6',
|
|
curveHandleStroke: '#ffffff',
|
|
curveHandleHoverStroke: '#5eead4',
|
|
measurementStroke: '#0f766e',
|
|
measurementLabelBackground: '#ffffff',
|
|
measurementLabelText: '#0f172a',
|
|
}
|
|
|
|
const context = (unit: 'metric' | 'imperial', selected = false): GeometryContext => ({
|
|
resolve: () => undefined,
|
|
children: [],
|
|
siblings: [],
|
|
parent: null,
|
|
viewState: {
|
|
selected,
|
|
unit,
|
|
highlighted: false,
|
|
hovered: false,
|
|
moving: false,
|
|
palette,
|
|
},
|
|
})
|
|
|
|
const labels = (geometry: FloorplanGeometry): string[] => {
|
|
if (geometry.kind === 'dimension-label') return [geometry.text]
|
|
if (geometry.kind === 'group') return geometry.children.flatMap(labels)
|
|
return []
|
|
}
|
|
|
|
const flattenGeometry = (geometry: FloorplanGeometry): FloorplanGeometry[] =>
|
|
geometry.kind === 'group' ? [geometry, ...geometry.children.flatMap(flattenGeometry)] : [geometry]
|
|
|
|
describe('buildMeasurementFloorplan', () => {
|
|
test('formats distance labels with the active floorplan unit', () => {
|
|
const node = MeasurementNode.parse({
|
|
id: 'measurement_distance',
|
|
type: 'measurement',
|
|
measurement: {
|
|
kind: 'distance',
|
|
points: [
|
|
[0, 0, 0],
|
|
[3.048, 0, 0],
|
|
],
|
|
},
|
|
})
|
|
|
|
const metric = buildMeasurementFloorplan(node, context('metric'))
|
|
const imperial = buildMeasurementFloorplan(node, context('imperial'))
|
|
|
|
expect(metric && labels(metric)).toEqual(['3.05m'])
|
|
expect(imperial && labels(imperial)).toEqual([`10'0"`])
|
|
expect(
|
|
metric && flattenGeometry(metric).find((entry) => entry.kind === 'dimension-label'),
|
|
).toMatchObject({ appearance: 'outlined' })
|
|
})
|
|
|
|
test('uses indigo analysis colors in plan view', () => {
|
|
const node = MeasurementNode.parse({
|
|
id: 'measurement_appearance',
|
|
type: 'measurement',
|
|
measurement: {
|
|
kind: 'distance',
|
|
points: [
|
|
[0, 0, 0],
|
|
[1, 0, 0],
|
|
],
|
|
},
|
|
})
|
|
|
|
const persistent = buildMeasurementFloorplan(node, context('metric'))
|
|
const active = buildMeasurementFloorplan(node, context('metric', true))
|
|
expect(
|
|
persistent && flattenGeometry(persistent).find((entry) => entry.kind === 'line'),
|
|
).toMatchObject({ stroke: MEASUREMENT_FLOORPLAN_COLOR })
|
|
expect(active && flattenGeometry(active).find((entry) => entry.kind === 'line')).toMatchObject({
|
|
stroke: MEASUREMENT_ACTIVE_COLOR,
|
|
})
|
|
expect(
|
|
persistent && flattenGeometry(persistent).filter((entry) => entry.kind === 'endpoint-handle'),
|
|
).toHaveLength(0)
|
|
expect(
|
|
active && flattenGeometry(active).filter((entry) => entry.kind === 'endpoint-handle'),
|
|
).toHaveLength(2)
|
|
})
|
|
|
|
test('emits semantic polygon geometry and derived area and volume labels', () => {
|
|
const area = MeasurementNode.parse({
|
|
id: 'measurement_area',
|
|
type: 'measurement',
|
|
measurement: {
|
|
kind: 'area',
|
|
base: [
|
|
[0, 0, 0],
|
|
[2, 0, 0],
|
|
[2, 0, 3],
|
|
[0, 0, 3],
|
|
],
|
|
},
|
|
})
|
|
const volume = MeasurementNode.parse({
|
|
id: 'measurement_volume',
|
|
type: 'measurement',
|
|
measurement: {
|
|
kind: 'volume',
|
|
base: area.measurement.kind === 'area' ? area.measurement.base : [],
|
|
extrusion: [0, 2, 0],
|
|
},
|
|
})
|
|
|
|
const areaGeometry = buildMeasurementFloorplan(area, context('metric'))
|
|
const volumeGeometry = buildMeasurementFloorplan(volume, context('metric'))
|
|
|
|
expect(areaGeometry?.kind).toBe('group')
|
|
expect(areaGeometry && labels(areaGeometry)).toEqual(['A 6.0m²'])
|
|
expect(volumeGeometry && labels(volumeGeometry)).toEqual(['V 12.0m³'])
|
|
expect(
|
|
areaGeometry &&
|
|
flattenGeometry(areaGeometry).find((entry) => entry.kind === 'dimension-label'),
|
|
).toMatchObject({ appearance: 'outlined', screenUpright: true })
|
|
expect(
|
|
volumeGeometry &&
|
|
flattenGeometry(volumeGeometry).find((entry) => entry.kind === 'dimension-label'),
|
|
).toMatchObject({ appearance: 'outlined', screenUpright: true })
|
|
})
|
|
|
|
test('renders angle and perimeter as first-class measurement kinds', () => {
|
|
const angle = MeasurementNode.parse({
|
|
id: 'measurement_angle',
|
|
type: 'measurement',
|
|
measurement: {
|
|
kind: 'angle',
|
|
points: [
|
|
[1, 0, 0],
|
|
[0, 0, 0],
|
|
[0, 0, 1],
|
|
],
|
|
},
|
|
})
|
|
const perimeter = MeasurementNode.parse({
|
|
id: 'measurement_perimeter',
|
|
type: 'measurement',
|
|
measurement: {
|
|
kind: 'perimeter',
|
|
base: [
|
|
[0, 0, 0],
|
|
[3, 0, 0],
|
|
[3, 0, 4],
|
|
],
|
|
},
|
|
})
|
|
|
|
const angleGeometry = buildMeasurementFloorplan(angle, context('metric'))
|
|
const perimeterGeometry = buildMeasurementFloorplan(perimeter, context('metric'))
|
|
expect(angleGeometry && labels(angleGeometry)).toEqual(['90°'])
|
|
const anglePolylines = angleGeometry
|
|
? flattenGeometry(angleGeometry).filter((entry) => entry.kind === 'polyline')
|
|
: []
|
|
expect(anglePolylines).toHaveLength(2)
|
|
expect(anglePolylines[1]).toMatchObject({ strokeWidth: 3 })
|
|
if (anglePolylines[1]?.kind === 'polyline') {
|
|
expect(anglePolylines[1].points.length).toBeGreaterThan(4)
|
|
}
|
|
expect(perimeterGeometry && labels(perimeterGeometry)).toEqual(['P 12m'])
|
|
})
|
|
|
|
test('marks a missing semantic feature as unlinked instead of freezing silently', () => {
|
|
const node = MeasurementNode.parse({
|
|
id: 'measurement_unlinked',
|
|
type: 'measurement',
|
|
measurement: {
|
|
kind: 'distance',
|
|
points: [
|
|
{
|
|
kind: 'feature',
|
|
reference: { nodeId: 'wall_missing', featureId: 'wall:start' },
|
|
fallback: [0, 0, 0],
|
|
},
|
|
[2, 0, 0],
|
|
],
|
|
},
|
|
})
|
|
|
|
const geometry = buildMeasurementFloorplan(node, context('metric'))
|
|
expect(geometry && labels(geometry)).toEqual(['Unlinked · 2m'])
|
|
expect(
|
|
geometry && flattenGeometry(geometry).find((entry) => entry.kind === 'line'),
|
|
).toMatchObject({ stroke: '#dc2626' })
|
|
})
|
|
|
|
test('omits hidden measurements', () => {
|
|
const node = MeasurementNode.parse({
|
|
id: 'measurement_hidden',
|
|
type: 'measurement',
|
|
visible: false,
|
|
measurement: {
|
|
kind: 'distance',
|
|
points: [
|
|
[0, 0, 0],
|
|
[1, 0, 0],
|
|
],
|
|
},
|
|
})
|
|
|
|
expect(buildMeasurementFloorplan(node, context('metric'))).toBeNull()
|
|
})
|
|
|
|
test('keeps a vertically projected distance selectable in plan view', () => {
|
|
const node = MeasurementNode.parse({
|
|
id: 'measurement_vertical',
|
|
type: 'measurement',
|
|
measurement: {
|
|
kind: 'distance',
|
|
points: [
|
|
[1, 0, 2],
|
|
[1, 3, 2],
|
|
],
|
|
},
|
|
})
|
|
|
|
const geometry = buildMeasurementFloorplan(node, context('metric'))
|
|
expect(geometry).not.toBeNull()
|
|
if (!geometry) return
|
|
|
|
const hitTarget = flattenGeometry(geometry).find(
|
|
(entry) => entry.kind === 'circle' && entry.pointerEvents === 'all',
|
|
)
|
|
expect(hitTarget).toMatchObject({
|
|
kind: 'circle',
|
|
cx: 1,
|
|
cy: 2,
|
|
fill: 'transparent',
|
|
pointerEvents: 'all',
|
|
})
|
|
})
|
|
})
|