@tscircuit/rectdiff 0.0.19 → 0.0.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/bun-test.yml +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +28 -35
- package/lib/solvers/RectDiffExpansionSolver/RectDiffExpansionSolver.ts +6 -3
- package/lib/solvers/RectDiffGridSolverPipeline/buildObstacleIndexes.ts +2 -1
- package/lib/solvers/RectDiffSeedingSolver/RectDiffSeedingSolver.ts +2 -7
- package/lib/types/capacity-mesh-types.ts +1 -0
- package/lib/utils/expandRectFromSeed.ts +3 -0
- package/lib/utils/rectToTree.ts +5 -1
- package/lib/utils/resizeSoftOverlaps.ts +8 -16
- package/package.json +1 -1
- package/tests/solver/__snapshots__/rectDiffGridSolverPipeline.snap.svg +3 -3
- package/tests/solver/both-points-equivalent/__snapshots__/both-points-equivalent.snap.svg +44 -0
- package/tests/solver/both-points-equivalent/both-points-equivalent.srj.json +64 -0
- package/tests/solver/both-points-equivalent/both-points-equivalent.test.ts +92 -0
- package/tests/solver/bugreport01-be84eb/__snapshots__/bugreport01-be84eb.snap.svg +44 -0
- package/tests/solver/bugreport01-be84eb/bugreport01-be84eb.json +929 -0
- package/tests/solver/bugreport01-be84eb/bugreport01-be84eb.test.ts +93 -0
- package/tests/solver/bugreport02-bc4361/__snapshots__/bugreport02-bc4361.snap.svg +44 -0
- package/tests/solver/bugreport02-bc4361/bugreport02-bc4361.json +1276 -0
- package/tests/solver/bugreport02-bc4361/bugreport02-bc4361.test.ts +93 -0
- package/tests/solver/bugreport03-fe4a17/__snapshots__/bugreport03-fe4a17.snap.svg +44 -0
- package/tests/solver/bugreport03-fe4a17/bugreport03-fe4a17.json +986 -0
- package/tests/solver/bugreport03-fe4a17/bugreport03-fe4a17.test.ts +93 -0
- package/tests/solver/bugreport07-d3f3be/__snapshots__/bugreport07-d3f3be.snap.svg +44 -0
- package/tests/solver/bugreport07-d3f3be/bugreport07-d3f3be.json +1211 -0
- package/tests/solver/bugreport07-d3f3be/bugreport07-d3f3be.test.ts +93 -0
- package/tests/solver/bugreport08-e3ec95/__snapshots__/bugreport08-e3ec95.snap.svg +44 -0
- package/tests/solver/bugreport08-e3ec95/bugreport08-e3ec95.json +1511 -0
- package/tests/solver/bugreport08-e3ec95/bugreport08-e3ec95.test.ts +93 -0
- package/tests/solver/bugreport09-618e09/__snapshots__/bugreport09-618e09.snap.svg +44 -0
- package/tests/solver/bugreport09-618e09/bugreport09-618e09.json +2827 -0
- package/tests/solver/bugreport09-618e09/bugreport09-618e09.test.ts +93 -0
- package/tests/solver/bugreport10-71239a/__snapshots__/bugreport10-71239a.snap.svg +44 -0
- package/tests/solver/bugreport10-71239a/bugreport10-71239a.json +890 -0
- package/tests/solver/bugreport10-71239a/bugreport10-71239a.test.ts +93 -0
- package/tests/solver/bugreport11-b2de3c/__snapshots__/bugreport11-b2de3c.snap.svg +44 -0
- package/tests/solver/bugreport11-b2de3c/bugreport11-b2de3c.json +4315 -0
- package/tests/solver/bugreport11-b2de3c/bugreport11-b2de3c.test.ts +93 -0
- package/tests/solver/bugreport12-35ce1c/__snapshots__/bugreport12-35ce1c.snap.svg +44 -0
- package/tests/solver/bugreport12-35ce1c/bugreport12-35ce1c.json +475 -0
- package/tests/solver/bugreport12-35ce1c/bugreport12-35ce1c.test.ts +93 -0
- package/tests/solver/bugreport13-b9a758/__snapshots__/bugreport13-b9a758.snap.svg +44 -0
- package/tests/solver/bugreport13-b9a758/bugreport13-b9a758.json +15815 -0
- package/tests/solver/bugreport13-b9a758/bugreport13-b9a758.test.ts +93 -0
- package/tests/solver/bugreport16-d95f38/__snapshots__/bugreport16-d95f38.snap.svg +44 -0
- package/tests/solver/bugreport16-d95f38/bugreport16-d95f38.json +623 -0
- package/tests/solver/bugreport16-d95f38/bugreport16-d95f38.test.ts +93 -0
- package/tests/solver/bugreport18-1b2d06/__snapshots__/bugreport18-1b2d06.snap.svg +44 -0
- package/tests/solver/bugreport18-1b2d06/bugreport18-1b2d06.json +543 -0
- package/tests/solver/bugreport18-1b2d06/bugreport18-1b2d06.test.ts +93 -0
- package/tests/solver/bugreport19/__snapshots__/bugreport19.snap.svg +44 -0
- package/tests/solver/bugreport19/bugreport19.json +678 -0
- package/tests/solver/bugreport19/bugreport19.test.ts +93 -0
- package/tests/solver/bugreport20-obstacle-clipping/__snapshots__/bugreport20-obstacle-clipping.snap.svg +44 -0
- package/tests/solver/bugreport20-obstacle-clipping/bugreport20-obstacle-clipping.json +109 -0
- package/tests/solver/bugreport20-obstacle-clipping/bugreport20-obstacle-clipping.test.ts +93 -0
- package/tests/solver/bugreport21-board-outline/__snapshots__/bugreport21-board-outline.snap.svg +44 -0
- package/tests/solver/bugreport21-board-outline/bugreport21-board-outline.json +148 -0
- package/tests/solver/bugreport21-board-outline/bugreport21-board-outline.test.ts +93 -0
- package/tests/solver/bugreport22-2a75ce/__snapshots__/bugreport22-2a75ce.snap.svg +44 -0
- package/tests/solver/bugreport22-2a75ce/bugreport22-2a75ce.json +1550 -0
- package/tests/solver/bugreport22-2a75ce/bugreport22-2a75ce.test.ts +93 -0
- package/tests/solver/bugreport23-LGA15x4/__snapshots__/bugreport23-LGA15x4.snap.svg +44 -0
- package/tests/solver/bugreport23-LGA15x4/bugreport23-LGA15x4.srj.json +2401 -0
- package/tests/solver/bugreport23-LGA15x4/bugreport23-LGA15x4.test.ts +92 -0
- package/tests/solver/bugreport24-05597c/__snapshots__/bugreport24-05597c.snap.svg +44 -0
- package/tests/solver/bugreport24-05597c/bugreport24-05597c.json +8427 -0
- package/tests/solver/bugreport24-05597c/bugreport24-05597c.test.ts +93 -0
- package/tests/solver/bugreport25-4b1d55/__snapshots__/bugreport25-4b1d55.snap.svg +44 -0
- package/tests/solver/bugreport25-4b1d55/bugreport25-4b1d55.json +119 -0
- package/tests/solver/bugreport25-4b1d55/bugreport25-4b1d55.test.ts +93 -0
- package/tests/solver/bugreport26-66b0b2/__snapshots__/bugreport26-66b0b2.snap.svg +44 -0
- package/tests/solver/bugreport26-66b0b2/bugreport26-66b0b2.json +1651 -0
- package/tests/solver/bugreport26-66b0b2/bugreport26-66b0b2.test.ts +93 -0
- package/tests/solver/bugreport27-dd3734/__snapshots__/bugreport27-dd3734.snap.svg +44 -0
- package/tests/solver/bugreport27-dd3734/bugreport27-dd3734.json +4116 -0
- package/tests/solver/bugreport27-dd3734/bugreport27-dd3734.test.ts +93 -0
- package/tests/solver/bugreport28-18a9ef/__snapshots__/bugreport28-18a9ef.snap.svg +44 -0
- package/tests/solver/bugreport28-18a9ef/bugreport28-18a9ef.json +4116 -0
- package/tests/solver/bugreport28-18a9ef/bugreport28-18a9ef.test.ts +93 -0
- package/tests/solver/bugreport29-7deae8/__snapshots__/bugreport29-7deae8.snap.svg +44 -0
- package/tests/solver/bugreport29-7deae8/bugreport29-7deae8.json +4118 -0
- package/tests/solver/bugreport29-7deae8/bugreport29-7deae8.test.ts +93 -0
- package/tests/solver/bugreport30-2174c8/__snapshots__/bugreport30-2174c8.snap.svg +44 -0
- package/tests/solver/bugreport30-2174c8/bugreport30-2174c8.json +4007 -0
- package/tests/solver/bugreport30-2174c8/bugreport30-2174c8.test.ts +93 -0
- package/tests/solver/bugreport33-213d45/__snapshots__/bugreport33-213d45.snap.svg +44 -0
- package/tests/solver/bugreport33-213d45/bugreport33-213d45.json +5089 -0
- package/tests/solver/bugreport33-213d45/bugreport33-213d45.test.ts +93 -0
- package/tests/solver/bugreport34-e9dea2/__snapshots__/bugreport34-e9dea2.snap.svg +44 -0
- package/tests/solver/bugreport34-e9dea2/bugreport34-e9dea2.json +3924 -0
- package/tests/solver/bugreport34-e9dea2/bugreport34-e9dea2.test.ts +93 -0
- package/tests/solver/bugreport35-191db9/__snapshots__/bugreport35-191db9.snap.svg +44 -0
- package/tests/solver/bugreport35-191db9/bugreport35-191db9.json +4237 -0
- package/tests/solver/bugreport35-191db9/bugreport35-191db9.test.ts +93 -0
- package/tests/solver/bugreport36-bf8303/__snapshots__/bugreport36-bf8303.snap.svg +44 -0
- package/tests/solver/bugreport36-bf8303/bugreport36-bf8303.json +29660 -0
- package/tests/solver/bugreport36-bf8303/bugreport36-bf8303.test.ts +93 -0
- package/tests/solver/interaction/__snapshots__/interaction.snap.svg +44 -0
- package/tests/solver/interaction/interaction.srj.json +58 -0
- package/tests/solver/interaction/interaction.test.ts +92 -0
- package/tests/solver/multi-point/__snapshots__/multi-point.snap.svg +44 -0
- package/tests/solver/multi-point/multi-point.srj.json +57 -0
- package/tests/solver/multi-point/multi-point.test.ts +92 -0
- package/tests/solver/no-better-path/__snapshots__/no-better-path.snap.svg +44 -0
- package/tests/solver/no-better-path/no-better-path.srj.json +48 -0
- package/tests/solver/no-better-path/no-better-path.test.ts +92 -0
- package/tests/solver/offboardconnects01/__snapshots__/offboardconnects01.snap.svg +44 -0
- package/tests/solver/offboardconnects01/offboardconnects01.srj.json +53 -0
- package/tests/solver/offboardconnects01/offboardconnects01.test.ts +92 -0
- package/tests/solver/pcb_trace_id-should-return-root-connection-name/__snapshots__/pcb_trace_id-should-return-root-connection-name.snap.svg +44 -0
- package/tests/solver/pcb_trace_id-should-return-root-connection-name/pcb_trace_id-should-return-root-connection-name.srj.json +129 -0
- package/tests/solver/pcb_trace_id-should-return-root-connection-name/pcb_trace_id-should-return-root-connection-name.test.ts +92 -0
- package/tests/solver/transitivity/__snapshots__/transitivity.snap.svg +44 -0
- package/tests/solver/transitivity/transitivity.srj.json +64 -0
- package/tests/solver/transitivity/transitivity.test.ts +92 -0
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { expect, test } from "bun:test"
|
|
2
|
+
import srj_json from "./bugreport36-bf8303.json"
|
|
3
|
+
import {
|
|
4
|
+
getBounds,
|
|
5
|
+
getSvgFromGraphicsObject,
|
|
6
|
+
mergeGraphics,
|
|
7
|
+
stackGraphicsVertically,
|
|
8
|
+
type GraphicsObject,
|
|
9
|
+
type Rect,
|
|
10
|
+
} from "graphics-debug"
|
|
11
|
+
import { RectDiffPipeline } from "lib/RectDiffPipeline"
|
|
12
|
+
import { makeCapacityMeshNodeWithLayerInfo } from "tests/fixtures/makeCapacityMeshNodeWithLayerInfo"
|
|
13
|
+
import { makeSimpleRouteOutlineGraphics } from "tests/fixtures/makeSimpleRouteOutlineGraphics"
|
|
14
|
+
|
|
15
|
+
const srj = srj_json.simple_route_json ?? srj_json.simpleRouteJson ?? srj_json
|
|
16
|
+
|
|
17
|
+
test("bugreport36-bf8303", async () => {
|
|
18
|
+
const solver = new RectDiffPipeline({
|
|
19
|
+
simpleRouteJson: srj,
|
|
20
|
+
})
|
|
21
|
+
|
|
22
|
+
const outline = makeSimpleRouteOutlineGraphics(srj)
|
|
23
|
+
|
|
24
|
+
solver.solve()
|
|
25
|
+
|
|
26
|
+
const { meshNodes } = solver.getOutput()
|
|
27
|
+
const rectsByCombo = makeCapacityMeshNodeWithLayerInfo(meshNodes)
|
|
28
|
+
const allGraphicsObjects: GraphicsObject[] = []
|
|
29
|
+
|
|
30
|
+
for (const z of Array.from({ length: srj.layerCount }, (_, index) => index)) {
|
|
31
|
+
const layerRects: Rect[] = []
|
|
32
|
+
|
|
33
|
+
for (const [key, rects] of rectsByCombo) {
|
|
34
|
+
const layers = key
|
|
35
|
+
.split(",")
|
|
36
|
+
.map((value) => Number.parseInt(value, 10))
|
|
37
|
+
.filter((value) => !Number.isNaN(value))
|
|
38
|
+
|
|
39
|
+
if (layers.includes(z)) {
|
|
40
|
+
layerRects.push(...rects)
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
let labelY = 0
|
|
45
|
+
|
|
46
|
+
if (layerRects.length > 0) {
|
|
47
|
+
let maxY = -Infinity
|
|
48
|
+
|
|
49
|
+
for (const rect of layerRects) {
|
|
50
|
+
const top = rect.center.y + rect.height * (2 / 3)
|
|
51
|
+
|
|
52
|
+
if (top > maxY) maxY = top
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
labelY = maxY
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
const graphics: GraphicsObject = {
|
|
59
|
+
title: `RectDiffPipeline - z${z}`,
|
|
60
|
+
texts: [
|
|
61
|
+
{
|
|
62
|
+
anchorSide: "top_right",
|
|
63
|
+
text: `Layer z=${z}`,
|
|
64
|
+
x: 0,
|
|
65
|
+
y: labelY,
|
|
66
|
+
fontSize: 0.5,
|
|
67
|
+
},
|
|
68
|
+
],
|
|
69
|
+
coordinateSystem: "cartesian",
|
|
70
|
+
rects: layerRects,
|
|
71
|
+
points: [],
|
|
72
|
+
lines: [],
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
allGraphicsObjects.push(mergeGraphics(graphics, outline))
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
const stackedGraphics = stackGraphicsVertically(allGraphicsObjects)
|
|
79
|
+
const bounds = getBounds(stackedGraphics)
|
|
80
|
+
const boundsWidth = Math.max(1, bounds.maxX - bounds.minX)
|
|
81
|
+
const boundsHeight = Math.max(1, bounds.maxY - bounds.minY)
|
|
82
|
+
const svgWidth = 640
|
|
83
|
+
const svgHeight = Math.max(
|
|
84
|
+
svgWidth,
|
|
85
|
+
Math.ceil((boundsHeight / boundsWidth) * svgWidth),
|
|
86
|
+
)
|
|
87
|
+
|
|
88
|
+
const svg = getSvgFromGraphicsObject(stackedGraphics, {
|
|
89
|
+
svgWidth,
|
|
90
|
+
svgHeight,
|
|
91
|
+
})
|
|
92
|
+
await expect(svg).toMatchSvgSnapshot(import.meta.path)
|
|
93
|
+
})
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
<svg width="640" height="1608" viewBox="0 0 640 1608" xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%" fill="white"/><g><polyline data-points="-10,-10 15,-10 15,15 -10,15 -10,-10" data-type="line" data-label="bounds" points="40,725.8333333333334 600,725.8333333333334 600,165.83333333333337 40,165.83333333333337 40,725.8333333333334" fill="none" stroke="#111827" stroke-width="2.2399999999999998"/></g><g><polyline data-points="-10,-44.89583333333333 15,-44.89583333333333 15,-19.89583333333333 -10,-19.89583333333333 -10,-44.89583333333333" data-type="line" data-label="bounds" points="40,1507.5 600,1507.5 600,947.4999999999999 40,947.4999999999999 40,1507.5" fill="none" stroke="#111827" stroke-width="2.2399999999999998"/></g><g><rect data-type="rect" data-label="node" data-x="-0.25" data-y="7.75" x="40" y="165.83333333333337" width="436.79999999999995" height="324.8" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="5.25" data-y="-5.25" x="163.2" y="513.0333333333334" width="436.8" height="212.79999999999995" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="-7.25" data-y="-7.75" x="40" y="625.0333333333333" width="123.19999999999999" height="100.80000000000007" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="-7.25" data-y="-2" x="40" y="490.6333333333334" width="123.19999999999999" height="111.99999999999994" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="12.75" data-y="8.25" x="499.2" y="165.83333333333337" width="100.80000000000001" height="302.4" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="12.75" data-y="0.5" x="499.2" y="468.23333333333335" width="100.80000000000001" height="44.80000000000007" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="10" data-y="5" x="476.79999999999995" y="289.0333333333334" width="22.400000000000034" height="201.59999999999997" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="10" data-y="12.75" x="476.79999999999995" y="165.83333333333337" width="22.400000000000034" height="100.80000000000001" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="-7.75" data-y="-5" x="40" y="602.6333333333333" width="100.80000000000001" height="22.399999999999977" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="5" data-y="0" x="275.2" y="490.6333333333334" width="201.59999999999997" height="22.400000000000034" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="-2.5" data-y="0" x="163.2" y="490.6333333333334" width="89.60000000000002" height="22.400000000000034" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="0" data-y="0" x="252.8" y="490.6333333333334" width="22.399999999999977" height="22.400000000000034" fill="red" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="-5" data-y="-5" x="140.8" y="602.6333333333333" width="22.399999999999977" height="22.399999999999977" fill="red" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="10" data-y="0" x="476.79999999999995" y="490.6333333333334" width="22.400000000000034" height="22.400000000000034" fill="red" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="10" data-y="10" x="476.79999999999995" y="266.6333333333334" width="22.400000000000034" height="22.400000000000034" fill="red" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="-0.25" data-y="-27.14583333333333" x="40" y="947.4999999999999" width="436.79999999999995" height="324.79999999999984" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="5.25" data-y="-40.14583333333333" x="163.2" y="1294.6999999999998" width="436.8" height="212.80000000000018" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="-7.25" data-y="-42.64583333333333" x="40" y="1406.6999999999998" width="123.19999999999999" height="100.80000000000018" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="-7.25" data-y="-36.89583333333333" x="40" y="1272.2999999999997" width="123.19999999999999" height="112" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="12.75" data-y="-26.64583333333333" x="499.2" y="947.4999999999999" width="100.80000000000001" height="302.4" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="12.75" data-y="-34.39583333333333" x="499.2" y="1249.8999999999999" width="100.80000000000001" height="44.799999999999955" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="10" data-y="-29.89583333333333" x="476.79999999999995" y="1070.6999999999998" width="22.400000000000034" height="201.5999999999999" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="10" data-y="-22.14583333333333" x="476.79999999999995" y="947.4999999999999" width="22.400000000000034" height="100.79999999999984" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="-7.75" data-y="-39.89583333333333" x="40" y="1384.2999999999997" width="100.80000000000001" height="22.40000000000009" fill="#dbeafe" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="-5" data-y="-39.89583333333333" x="140.8" y="1384.2999999999997" width="22.399999999999977" height="22.40000000000009" fill="#fef3c7" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="3" data-y="-34.89583333333333" x="163.2" y="1272.2999999999997" width="336" height="22.40000000000009" fill="#fef3c7" stroke="black" stroke-width="0.044642857142857144"/></g><g><rect data-type="rect" data-label="node" data-x="10" data-y="-24.89583333333333" x="476.79999999999995" y="1048.2999999999997" width="22.400000000000034" height="22.40000000000009" fill="#fef3c7" stroke="black" stroke-width="0.044642857142857144"/></g><text data-type="text" data-label="Layer z=0" data-x="0" data-y="17.416666666666664" x="264" y="111.7000000000001" fill="black" font-size="11.2" font-family="sans-serif" text-anchor="end" dominant-baseline="text-before-edge">Layer z=0</text><text data-type="text" data-label="Layer z=1" data-x="0" data-y="-17.479166666666664" x="264" y="893.3666666666666" fill="black" font-size="11.2" font-family="sans-serif" text-anchor="end" dominant-baseline="text-before-edge">Layer z=1</text><g id="crosshair" style="display: none"><line id="crosshair-h" y1="0" y2="1608" stroke="#666" stroke-width="0.5"/><line id="crosshair-v" x1="0" x2="640" stroke="#666" stroke-width="0.5"/><text id="coordinates" font-family="monospace" font-size="12" fill="#666"></text></g><script><![CDATA[
|
|
2
|
+
document.currentScript.parentElement.addEventListener('mousemove', (e) => {
|
|
3
|
+
const svg = e.currentTarget;
|
|
4
|
+
const rect = svg.getBoundingClientRect();
|
|
5
|
+
const x = e.clientX - rect.left;
|
|
6
|
+
const y = e.clientY - rect.top;
|
|
7
|
+
const crosshair = svg.getElementById('crosshair');
|
|
8
|
+
const h = svg.getElementById('crosshair-h');
|
|
9
|
+
const v = svg.getElementById('crosshair-v');
|
|
10
|
+
const coords = svg.getElementById('coordinates');
|
|
11
|
+
|
|
12
|
+
crosshair.style.display = 'block';
|
|
13
|
+
h.setAttribute('x1', '0');
|
|
14
|
+
h.setAttribute('x2', '640');
|
|
15
|
+
h.setAttribute('y1', y);
|
|
16
|
+
h.setAttribute('y2', y);
|
|
17
|
+
v.setAttribute('x1', x);
|
|
18
|
+
v.setAttribute('x2', x);
|
|
19
|
+
v.setAttribute('y1', '0');
|
|
20
|
+
v.setAttribute('y2', '1608');
|
|
21
|
+
|
|
22
|
+
// Calculate real coordinates using inverse transformation
|
|
23
|
+
const matrix = {"a":22.4,"c":0,"e":264,"b":0,"d":-22.4,"f":501.83333333333337};
|
|
24
|
+
// Manually invert and apply the affine transform
|
|
25
|
+
// Since we only use translate and scale, we can directly compute:
|
|
26
|
+
// x' = (x - tx) / sx
|
|
27
|
+
// y' = (y - ty) / sy
|
|
28
|
+
const sx = matrix.a;
|
|
29
|
+
const sy = matrix.d;
|
|
30
|
+
const tx = matrix.e;
|
|
31
|
+
const ty = matrix.f;
|
|
32
|
+
const realPoint = {
|
|
33
|
+
x: (x - tx) / sx,
|
|
34
|
+
y: (y - ty) / sy // Flip y back since we used negative scale
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
coords.textContent = `(${realPoint.x.toFixed(2)}, ${realPoint.y.toFixed(2)})`;
|
|
38
|
+
coords.setAttribute('x', (x + 5).toString());
|
|
39
|
+
coords.setAttribute('y', (y - 5).toString());
|
|
40
|
+
});
|
|
41
|
+
document.currentScript.parentElement.addEventListener('mouseleave', () => {
|
|
42
|
+
document.currentScript.parentElement.getElementById('crosshair').style.display = 'none';
|
|
43
|
+
});
|
|
44
|
+
]]></script></svg>
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
{
|
|
2
|
+
"layerCount": 2,
|
|
3
|
+
"minTraceWidth": 0.2,
|
|
4
|
+
"obstacles": [
|
|
5
|
+
{
|
|
6
|
+
"type": "rect",
|
|
7
|
+
"layers": ["top"],
|
|
8
|
+
"center": { "x": 0, "y": 0 },
|
|
9
|
+
"width": 1,
|
|
10
|
+
"height": 1,
|
|
11
|
+
"connectedTo": ["A"]
|
|
12
|
+
},
|
|
13
|
+
{
|
|
14
|
+
"type": "rect",
|
|
15
|
+
"layers": ["top"],
|
|
16
|
+
"center": { "x": -5, "y": -5 },
|
|
17
|
+
"width": 1,
|
|
18
|
+
"height": 1,
|
|
19
|
+
"connectedTo": ["A_prime"]
|
|
20
|
+
},
|
|
21
|
+
{
|
|
22
|
+
"type": "rect",
|
|
23
|
+
"layers": ["top"],
|
|
24
|
+
"center": { "x": 10, "y": 0 },
|
|
25
|
+
"width": 1,
|
|
26
|
+
"height": 1,
|
|
27
|
+
"connectedTo": ["B"]
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
"type": "rect",
|
|
31
|
+
"layers": ["top"],
|
|
32
|
+
"center": { "x": 10, "y": 10 },
|
|
33
|
+
"width": 1,
|
|
34
|
+
"height": 1,
|
|
35
|
+
"connectedTo": ["C"]
|
|
36
|
+
}
|
|
37
|
+
],
|
|
38
|
+
"connections": [
|
|
39
|
+
{
|
|
40
|
+
"name": "on-board-net",
|
|
41
|
+
"pointsToConnect": [
|
|
42
|
+
{ "x": 0, "y": 0, "layer": "top", "pointId": "A" },
|
|
43
|
+
{ "x": 10, "y": 0, "layer": "top", "pointId": "B" },
|
|
44
|
+
{ "x": 10, "y": 10, "layer": "top", "pointId": "C" }
|
|
45
|
+
],
|
|
46
|
+
"externallyConnectedPointIds": [["B", "C"]]
|
|
47
|
+
},
|
|
48
|
+
{
|
|
49
|
+
"name": "off-board-A",
|
|
50
|
+
"isOffBoard": true,
|
|
51
|
+
"pointsToConnect": [
|
|
52
|
+
{ "x": 0, "y": 0, "layer": "top", "pointId": "A" },
|
|
53
|
+
{ "x": -5, "y": -5, "layer": "top", "pointId": "A_prime" }
|
|
54
|
+
]
|
|
55
|
+
}
|
|
56
|
+
],
|
|
57
|
+
"bounds": { "minX": -10, "maxX": 15, "minY": -10, "maxY": 15 }
|
|
58
|
+
}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { expect, test } from "bun:test"
|
|
2
|
+
import srj from "./interaction.srj.json"
|
|
3
|
+
import {
|
|
4
|
+
getBounds,
|
|
5
|
+
getSvgFromGraphicsObject,
|
|
6
|
+
mergeGraphics,
|
|
7
|
+
stackGraphicsVertically,
|
|
8
|
+
type GraphicsObject,
|
|
9
|
+
type Rect,
|
|
10
|
+
} from "graphics-debug"
|
|
11
|
+
import { RectDiffPipeline } from "lib/RectDiffPipeline"
|
|
12
|
+
import { makeCapacityMeshNodeWithLayerInfo } from "tests/fixtures/makeCapacityMeshNodeWithLayerInfo"
|
|
13
|
+
import { makeSimpleRouteOutlineGraphics } from "tests/fixtures/makeSimpleRouteOutlineGraphics"
|
|
14
|
+
|
|
15
|
+
test("interaction", async () => {
|
|
16
|
+
const solver = new RectDiffPipeline({
|
|
17
|
+
simpleRouteJson: srj,
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
const outline = makeSimpleRouteOutlineGraphics(srj)
|
|
21
|
+
|
|
22
|
+
solver.solve()
|
|
23
|
+
|
|
24
|
+
const { meshNodes } = solver.getOutput()
|
|
25
|
+
const rectsByCombo = makeCapacityMeshNodeWithLayerInfo(meshNodes)
|
|
26
|
+
const allGraphicsObjects: GraphicsObject[] = []
|
|
27
|
+
|
|
28
|
+
// Generate a snapshot for each z-layer
|
|
29
|
+
for (const z of Array.from({ length: srj.layerCount }, (_, index) => index)) {
|
|
30
|
+
const layerRects: Rect[] = []
|
|
31
|
+
|
|
32
|
+
for (const [key, rects] of rectsByCombo) {
|
|
33
|
+
const layers = key
|
|
34
|
+
.split(",")
|
|
35
|
+
.map((value) => Number.parseInt(value, 10))
|
|
36
|
+
.filter((value) => !Number.isNaN(value))
|
|
37
|
+
|
|
38
|
+
if (layers.includes(z)) {
|
|
39
|
+
layerRects.push(...rects)
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
let labelY = 0
|
|
44
|
+
|
|
45
|
+
if (layerRects.length > 0) {
|
|
46
|
+
let maxY = -Infinity
|
|
47
|
+
|
|
48
|
+
for (const rect of layerRects) {
|
|
49
|
+
const top = rect.center.y + rect.height * (2 / 3)
|
|
50
|
+
|
|
51
|
+
if (top > maxY) maxY = top
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
labelY = maxY
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
const graphics: GraphicsObject = {
|
|
58
|
+
title: `RectDiffPipeline - z${z}`,
|
|
59
|
+
texts: [
|
|
60
|
+
{
|
|
61
|
+
anchorSide: "top_right",
|
|
62
|
+
text: `Layer z=${z}`,
|
|
63
|
+
x: 0,
|
|
64
|
+
y: labelY,
|
|
65
|
+
fontSize: 0.5,
|
|
66
|
+
},
|
|
67
|
+
],
|
|
68
|
+
coordinateSystem: "cartesian",
|
|
69
|
+
rects: layerRects,
|
|
70
|
+
points: [],
|
|
71
|
+
lines: [],
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
allGraphicsObjects.push(mergeGraphics(graphics, outline))
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
const stackedGraphics = stackGraphicsVertically(allGraphicsObjects)
|
|
78
|
+
const bounds = getBounds(stackedGraphics)
|
|
79
|
+
const boundsWidth = Math.max(1, bounds.maxX - bounds.minX)
|
|
80
|
+
const boundsHeight = Math.max(1, bounds.maxY - bounds.minY)
|
|
81
|
+
const svgWidth = 640
|
|
82
|
+
const svgHeight = Math.max(
|
|
83
|
+
svgWidth,
|
|
84
|
+
Math.ceil((boundsHeight / boundsWidth) * svgWidth),
|
|
85
|
+
)
|
|
86
|
+
|
|
87
|
+
const svg = getSvgFromGraphicsObject(stackedGraphics, {
|
|
88
|
+
svgWidth,
|
|
89
|
+
svgHeight,
|
|
90
|
+
})
|
|
91
|
+
await expect(svg).toMatchSvgSnapshot(import.meta.path)
|
|
92
|
+
})
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
<svg width="640" height="1672" viewBox="0 0 640 1672" xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%" fill="white"/><g><polyline data-points="-5,-5 25,-5 25,25 -5,25 -5,-5" data-type="line" data-label="bounds" points="39.99999999999997,750.0555555555557 600,750.0555555555557 600,190.0555555555556 39.99999999999997,190.0555555555556 39.99999999999997,750.0555555555557" fill="none" stroke="#111827" stroke-width="1.866666666666667"/></g><g><polyline data-points="-5,-48.791666666666664 25,-48.791666666666664 25,-18.791666666666664 -5,-18.791666666666664 -5,-48.791666666666664" data-type="line" data-label="bounds" points="39.99999999999997,1567.5 600,1567.5 600,1007.5 39.99999999999997,1007.5 39.99999999999997,1567.5" fill="none" stroke="#111827" stroke-width="1.866666666666667"/></g><g><rect data-type="rect" data-label="node" data-x="2.25" data-y="12.75" x="39.99999999999997" y="190.0555555555556" width="270.66666666666663" height="457.3333333333333" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="17.25" data-y="5" x="310.66666666666663" y="479.3888888888889" width="289.33333333333337" height="168" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="17.25" data-y="17.75" x="310.66666666666663" y="190.0555555555556" width="289.33333333333337" height="270.6666666666667" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="14.925" data-y="10" x="376.93333333333334" y="460.7222222222223" width="70" height="18.66666666666663" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="18.675" data-y="10" x="446.93333333333334" y="460.7222222222223" width="70.00000000000006" height="18.66666666666663" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="2.7500000000000004" data-y="-2.75" x="58.66666666666666" y="666.0555555555557" width="251.99999999999997" height="84" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="14.5" data-y="-2" x="310.66666666666663" y="647.3888888888889" width="186.66666666666669" height="93.33333333333337" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="22.75" data-y="-2.25" x="516" y="647.3888888888889" width="84" height="102.66666666666674" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="11.774999999999999" data-y="10" x="329.3333333333333" y="460.7222222222223" width="47.599999999999966" height="18.66666666666663" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="22.775" data-y="10" x="516.9333333333333" y="460.7222222222223" width="83.06666666666672" height="18.66666666666663" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-4.5" data-y="-1.0000000000000013" x="39.99999999999997" y="647.3888888888889" width="18.666666666666686" height="56.000000000000114" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-2.2499999999999996" data-y="0" x="58.66666666666666" y="647.3888888888889" width="65.33333333333333" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="2.41875" data-y="0" x="142.66666666666666" y="647.3888888888889" width="71.63333333333335" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="5.8375" data-y="0" x="214.3" y="647.3888888888889" width="55.99999999999994" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="8.41875" data-y="0" x="270.29999999999995" y="647.3888888888889" width="40.366666666666674" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="20" data-y="-2.75" x="497.3333333333333" y="666.0555555555557" width="18.666666666666686" height="84" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-4.5" data-y="-3.7500000000000013" x="39.99999999999997" y="703.388888888889" width="18.666666666666686" height="46.66666666666663" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="15" data-y="-4.75" x="329.3333333333333" y="740.7222222222223" width="168" height="9.333333333333371" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="0" data-y="0" x="123.99999999999999" y="647.3888888888889" width="18.66666666666667" height="18.666666666666742" fill="red" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="10" data-y="10" x="310.66666666666663" y="460.7222222222223" width="18.666666666666686" height="18.66666666666663" fill="red" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="20" data-y="0" x="497.3333333333333" y="647.3888888888889" width="18.666666666666686" height="18.666666666666742" fill="red" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="10" data-y="-5" x="310.66666666666663" y="740.7222222222223" width="18.666666666666686" height="18.66666666666663" fill="red" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="2.25" data-y="-31.041666666666664" x="39.99999999999997" y="1007.5" width="270.66666666666663" height="457.3333333333335" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="17.25" data-y="-38.791666666666664" x="310.66666666666663" y="1296.8333333333335" width="289.33333333333337" height="168" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="17.25" data-y="-26.041666666666664" x="310.66666666666663" y="1007.5" width="289.33333333333337" height="270.66666666666674" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="14.925" data-y="-33.791666666666664" x="376.93333333333334" y="1278.1666666666667" width="70" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="18.675" data-y="-33.791666666666664" x="446.93333333333334" y="1278.1666666666667" width="70.00000000000006" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="2.7500000000000004" data-y="-46.541666666666664" x="58.66666666666666" y="1483.5" width="251.99999999999997" height="84" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="14.5" data-y="-45.791666666666664" x="310.66666666666663" y="1464.8333333333335" width="186.66666666666669" height="93.33333333333326" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="22.75" data-y="-46.041666666666664" x="516" y="1464.8333333333335" width="84" height="102.66666666666652" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="11.774999999999999" data-y="-33.791666666666664" x="329.3333333333333" y="1278.1666666666667" width="47.599999999999966" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="22.775" data-y="-33.791666666666664" x="516.9333333333333" y="1278.1666666666667" width="83.06666666666672" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-4.5" data-y="-44.791666666666664" x="39.99999999999997" y="1464.8333333333335" width="18.666666666666686" height="56" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-2.2499999999999996" data-y="-43.791666666666664" x="58.66666666666666" y="1464.8333333333335" width="65.33333333333333" height="18.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="2.41875" data-y="-43.791666666666664" x="142.66666666666666" y="1464.8333333333335" width="71.63333333333335" height="18.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="5.8375" data-y="-43.791666666666664" x="214.3" y="1464.8333333333335" width="55.99999999999994" height="18.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="8.41875" data-y="-43.791666666666664" x="270.29999999999995" y="1464.8333333333335" width="40.366666666666674" height="18.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="20" data-y="-46.541666666666664" x="497.3333333333333" y="1483.5" width="18.666666666666686" height="84" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-4.5" data-y="-47.541666666666664" x="39.99999999999997" y="1520.8333333333335" width="18.666666666666686" height="46.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="14.5" data-y="-48.541666666666664" x="310.66666666666663" y="1558.1666666666667" width="186.66666666666669" height="9.333333333333258" fill="#fef3c7" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="10" data-y="-33.791666666666664" x="310.66666666666663" y="1278.1666666666667" width="18.666666666666686" height="18.666666666666742" fill="#fef3c7" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="20" data-y="-43.791666666666664" x="497.3333333333333" y="1464.8333333333335" width="18.666666666666686" height="18.666666666666515" fill="#fef3c7" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="0" data-y="-43.791666666666664" x="123.99999999999999" y="1464.8333333333335" width="18.66666666666667" height="18.666666666666515" fill="#fef3c7" stroke="black" stroke-width="0.05357142857142857"/></g><text data-type="text" data-label="Layer z=0" data-x="0" data-y="29.083333333333332" x="133.33333333333331" y="113.83333333333337" fill="black" font-size="9.333333333333334" font-family="sans-serif" text-anchor="end" dominant-baseline="text-before-edge">Layer z=0</text><text data-type="text" data-label="Layer z=1" data-x="0" data-y="-14.708333333333332" x="133.33333333333331" y="931.2777777777778" fill="black" font-size="9.333333333333334" font-family="sans-serif" text-anchor="end" dominant-baseline="text-before-edge">Layer z=1</text><g id="crosshair" style="display: none"><line id="crosshair-h" y1="0" y2="1672" stroke="#666" stroke-width="0.5"/><line id="crosshair-v" x1="0" x2="640" stroke="#666" stroke-width="0.5"/><text id="coordinates" font-family="monospace" font-size="12" fill="#666"></text></g><script><![CDATA[
|
|
2
|
+
document.currentScript.parentElement.addEventListener('mousemove', (e) => {
|
|
3
|
+
const svg = e.currentTarget;
|
|
4
|
+
const rect = svg.getBoundingClientRect();
|
|
5
|
+
const x = e.clientX - rect.left;
|
|
6
|
+
const y = e.clientY - rect.top;
|
|
7
|
+
const crosshair = svg.getElementById('crosshair');
|
|
8
|
+
const h = svg.getElementById('crosshair-h');
|
|
9
|
+
const v = svg.getElementById('crosshair-v');
|
|
10
|
+
const coords = svg.getElementById('coordinates');
|
|
11
|
+
|
|
12
|
+
crosshair.style.display = 'block';
|
|
13
|
+
h.setAttribute('x1', '0');
|
|
14
|
+
h.setAttribute('x2', '640');
|
|
15
|
+
h.setAttribute('y1', y);
|
|
16
|
+
h.setAttribute('y2', y);
|
|
17
|
+
v.setAttribute('x1', x);
|
|
18
|
+
v.setAttribute('x2', x);
|
|
19
|
+
v.setAttribute('y1', '0');
|
|
20
|
+
v.setAttribute('y2', '1672');
|
|
21
|
+
|
|
22
|
+
// Calculate real coordinates using inverse transformation
|
|
23
|
+
const matrix = {"a":18.666666666666668,"c":0,"e":133.33333333333331,"b":0,"d":-18.666666666666668,"f":656.7222222222223};
|
|
24
|
+
// Manually invert and apply the affine transform
|
|
25
|
+
// Since we only use translate and scale, we can directly compute:
|
|
26
|
+
// x' = (x - tx) / sx
|
|
27
|
+
// y' = (y - ty) / sy
|
|
28
|
+
const sx = matrix.a;
|
|
29
|
+
const sy = matrix.d;
|
|
30
|
+
const tx = matrix.e;
|
|
31
|
+
const ty = matrix.f;
|
|
32
|
+
const realPoint = {
|
|
33
|
+
x: (x - tx) / sx,
|
|
34
|
+
y: (y - ty) / sy // Flip y back since we used negative scale
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
coords.textContent = `(${realPoint.x.toFixed(2)}, ${realPoint.y.toFixed(2)})`;
|
|
38
|
+
coords.setAttribute('x', (x + 5).toString());
|
|
39
|
+
coords.setAttribute('y', (y - 5).toString());
|
|
40
|
+
});
|
|
41
|
+
document.currentScript.parentElement.addEventListener('mouseleave', () => {
|
|
42
|
+
document.currentScript.parentElement.getElementById('crosshair').style.display = 'none';
|
|
43
|
+
});
|
|
44
|
+
]]></script></svg>
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
{
|
|
2
|
+
"layerCount": 2,
|
|
3
|
+
"minTraceWidth": 0.2,
|
|
4
|
+
"obstacles": [
|
|
5
|
+
{
|
|
6
|
+
"type": "rect",
|
|
7
|
+
"layers": ["top"],
|
|
8
|
+
"center": { "x": 0, "y": 0 },
|
|
9
|
+
"width": 1,
|
|
10
|
+
"height": 1,
|
|
11
|
+
"connectedTo": ["A"]
|
|
12
|
+
},
|
|
13
|
+
{
|
|
14
|
+
"type": "rect",
|
|
15
|
+
"layers": ["top"],
|
|
16
|
+
"center": { "x": 10, "y": 10 },
|
|
17
|
+
"width": 1,
|
|
18
|
+
"height": 1,
|
|
19
|
+
"connectedTo": ["B"]
|
|
20
|
+
},
|
|
21
|
+
{
|
|
22
|
+
"type": "rect",
|
|
23
|
+
"layers": ["top"],
|
|
24
|
+
"center": { "x": 20, "y": 0 },
|
|
25
|
+
"width": 1,
|
|
26
|
+
"height": 1,
|
|
27
|
+
"connectedTo": ["C"]
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
"type": "rect",
|
|
31
|
+
"layers": ["top"],
|
|
32
|
+
"center": { "x": 10, "y": -5 },
|
|
33
|
+
"width": 1,
|
|
34
|
+
"height": 1,
|
|
35
|
+
"connectedTo": ["B_prime"]
|
|
36
|
+
}
|
|
37
|
+
],
|
|
38
|
+
"connections": [
|
|
39
|
+
{
|
|
40
|
+
"name": "on-board-net",
|
|
41
|
+
"pointsToConnect": [
|
|
42
|
+
{ "x": 0, "y": 0, "layer": "top", "pointId": "A" },
|
|
43
|
+
{ "x": 10, "y": 10, "layer": "top", "pointId": "B" },
|
|
44
|
+
{ "x": 20, "y": 0, "layer": "top", "pointId": "C" }
|
|
45
|
+
]
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
"name": "off-board-B",
|
|
49
|
+
"isOffBoard": true,
|
|
50
|
+
"pointsToConnect": [
|
|
51
|
+
{ "x": 10, "y": 10, "layer": "top", "pointId": "B" },
|
|
52
|
+
{ "x": 10, "y": -5, "layer": "top", "pointId": "B_prime" }
|
|
53
|
+
]
|
|
54
|
+
}
|
|
55
|
+
],
|
|
56
|
+
"bounds": { "minX": -5, "maxX": 25, "minY": -5, "maxY": 25 }
|
|
57
|
+
}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { expect, test } from "bun:test"
|
|
2
|
+
import srj from "./multi-point.srj.json"
|
|
3
|
+
import {
|
|
4
|
+
getBounds,
|
|
5
|
+
getSvgFromGraphicsObject,
|
|
6
|
+
mergeGraphics,
|
|
7
|
+
stackGraphicsVertically,
|
|
8
|
+
type GraphicsObject,
|
|
9
|
+
type Rect,
|
|
10
|
+
} from "graphics-debug"
|
|
11
|
+
import { RectDiffPipeline } from "lib/RectDiffPipeline"
|
|
12
|
+
import { makeCapacityMeshNodeWithLayerInfo } from "tests/fixtures/makeCapacityMeshNodeWithLayerInfo"
|
|
13
|
+
import { makeSimpleRouteOutlineGraphics } from "tests/fixtures/makeSimpleRouteOutlineGraphics"
|
|
14
|
+
|
|
15
|
+
test("multi-point", async () => {
|
|
16
|
+
const solver = new RectDiffPipeline({
|
|
17
|
+
simpleRouteJson: srj,
|
|
18
|
+
})
|
|
19
|
+
|
|
20
|
+
const outline = makeSimpleRouteOutlineGraphics(srj)
|
|
21
|
+
|
|
22
|
+
solver.solve()
|
|
23
|
+
|
|
24
|
+
const { meshNodes } = solver.getOutput()
|
|
25
|
+
const rectsByCombo = makeCapacityMeshNodeWithLayerInfo(meshNodes)
|
|
26
|
+
const allGraphicsObjects: GraphicsObject[] = []
|
|
27
|
+
|
|
28
|
+
// Generate a snapshot for each z-layer
|
|
29
|
+
for (const z of Array.from({ length: srj.layerCount }, (_, index) => index)) {
|
|
30
|
+
const layerRects: Rect[] = []
|
|
31
|
+
|
|
32
|
+
for (const [key, rects] of rectsByCombo) {
|
|
33
|
+
const layers = key
|
|
34
|
+
.split(",")
|
|
35
|
+
.map((value) => Number.parseInt(value, 10))
|
|
36
|
+
.filter((value) => !Number.isNaN(value))
|
|
37
|
+
|
|
38
|
+
if (layers.includes(z)) {
|
|
39
|
+
layerRects.push(...rects)
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
let labelY = 0
|
|
44
|
+
|
|
45
|
+
if (layerRects.length > 0) {
|
|
46
|
+
let maxY = -Infinity
|
|
47
|
+
|
|
48
|
+
for (const rect of layerRects) {
|
|
49
|
+
const top = rect.center.y + rect.height * (2 / 3)
|
|
50
|
+
|
|
51
|
+
if (top > maxY) maxY = top
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
labelY = maxY
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
const graphics: GraphicsObject = {
|
|
58
|
+
title: `RectDiffPipeline - z${z}`,
|
|
59
|
+
texts: [
|
|
60
|
+
{
|
|
61
|
+
anchorSide: "top_right",
|
|
62
|
+
text: `Layer z=${z}`,
|
|
63
|
+
x: 0,
|
|
64
|
+
y: labelY,
|
|
65
|
+
fontSize: 0.5,
|
|
66
|
+
},
|
|
67
|
+
],
|
|
68
|
+
coordinateSystem: "cartesian",
|
|
69
|
+
rects: layerRects,
|
|
70
|
+
points: [],
|
|
71
|
+
lines: [],
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
allGraphicsObjects.push(mergeGraphics(graphics, outline))
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
const stackedGraphics = stackGraphicsVertically(allGraphicsObjects)
|
|
78
|
+
const bounds = getBounds(stackedGraphics)
|
|
79
|
+
const boundsWidth = Math.max(1, bounds.maxX - bounds.minX)
|
|
80
|
+
const boundsHeight = Math.max(1, bounds.maxY - bounds.minY)
|
|
81
|
+
const svgWidth = 640
|
|
82
|
+
const svgHeight = Math.max(
|
|
83
|
+
svgWidth,
|
|
84
|
+
Math.ceil((boundsHeight / boundsWidth) * svgWidth),
|
|
85
|
+
)
|
|
86
|
+
|
|
87
|
+
const svg = getSvgFromGraphicsObject(stackedGraphics, {
|
|
88
|
+
svgWidth,
|
|
89
|
+
svgHeight,
|
|
90
|
+
})
|
|
91
|
+
await expect(svg).toMatchSvgSnapshot(import.meta.path)
|
|
92
|
+
})
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
<svg width="640" height="1620" viewBox="0 0 640 1620" xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%" fill="white"/><g><polyline data-points="-5,-5 25,-5 25,25 -5,25 -5,-5" data-type="line" data-label="bounds" points="39.99999999999997,731.25 600,731.25 600,171.24999999999994 39.99999999999997,171.24999999999994 39.99999999999997,731.25" fill="none" stroke="#111827" stroke-width="1.866666666666667"/></g><g><polyline data-points="-5,-47.1875 25,-47.1875 25,-17.1875 -5,-17.1875 -5,-47.1875" data-type="line" data-label="bounds" points="39.99999999999997,1518.75 600,1518.75 600,958.75 39.99999999999997,958.75 39.99999999999997,1518.75" fill="none" stroke="#111827" stroke-width="1.866666666666667"/></g><g><rect data-type="rect" data-label="node" data-x="7.25" data-y="15.25" x="39.99999999999997" y="171.24999999999994" width="457.33333333333337" height="364.00000000000006" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="4.9" data-y="2.5" x="112.79999999999998" y="553.9166666666666" width="224.00000000000003" height="74.66666666666663" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="17.95" data-y="0.25" x="336.79999999999995" y="535.25" width="263.20000000000005" height="196" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="4.1000000000000005" data-y="-2.75" x="82.93333333333332" y="647.25" width="253.86666666666667" height="84" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-3.05" data-y="2.5" x="39.99999999999997" y="535.25" width="72.80000000000001" height="112" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="22.75" data-y="16.1625" x="516" y="171.24999999999994" width="84" height="329.93333333333334" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="22.25" data-y="6.4125" x="497.3333333333333" y="501.1833333333333" width="102.66666666666669" height="34.06666666666672" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-3.8499999999999996" data-y="-2.75" x="39.99999999999997" y="647.25" width="42.93333333333335" height="84" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="0.5125000000000006" data-y="5" x="112.79999999999998" y="535.25" width="60.20000000000002" height="18.66666666666663" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="2.41875" data-y="0" x="142.66666666666666" y="628.5833333333333" width="71.63333333333335" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="3.3125000000000004" data-y="5" x="173" y="535.25" width="44.333333333333314" height="18.66666666666663" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="6.11875" data-y="0" x="214.3" y="628.5833333333333" width="66.49999999999994" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="7.09375" data-y="5" x="236" y="535.25" width="59.5" height="18.66666666666663" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="9.4" data-y="0" x="280.79999999999995" y="628.5833333333333" width="56.00000000000006" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="9.79375" data-y="5" x="295.5" y="535.25" width="41.299999999999955" height="18.66666666666663" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="20" data-y="13.4125" x="497.3333333333333" y="273.91666666666663" width="18.666666666666686" height="227.26666666666665" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="20" data-y="22.75" x="497.3333333333333" y="171.24999999999994" width="18.666666666666686" height="84" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-0.7999999999999998" data-y="0" x="112.79999999999998" y="628.5833333333333" width="11.200000000000003" height="18.666666666666742" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="0" data-y="0" x="123.99999999999999" y="628.5833333333333" width="18.66666666666667" height="18.666666666666742" fill="red" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="5" data-y="5" x="217.33333333333331" y="535.25" width="18.666666666666686" height="18.66666666666663" fill="red" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="20" data-y="20" x="497.3333333333333" y="255.24999999999994" width="18.666666666666686" height="18.666666666666686" fill="red" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="7.25" data-y="-26.9375" x="39.99999999999997" y="958.75" width="457.33333333333337" height="364" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="4.9" data-y="-39.6875" x="112.79999999999998" y="1341.4166666666665" width="224.00000000000003" height="74.66666666666697" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="17.95" data-y="-41.9375" x="336.79999999999995" y="1322.75" width="263.20000000000005" height="196" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="4.1000000000000005" data-y="-44.9375" x="82.93333333333332" y="1434.75" width="253.86666666666667" height="84" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-3.05" data-y="-39.6875" x="39.99999999999997" y="1322.75" width="72.80000000000001" height="112" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="22.75" data-y="-26.025" x="516" y="958.75" width="84" height="329.9333333333334" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="22.25" data-y="-35.775" x="497.3333333333333" y="1288.6833333333334" width="102.66666666666669" height="34.066666666666606" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-3.8499999999999996" data-y="-44.9375" x="39.99999999999997" y="1434.75" width="42.93333333333335" height="84" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="0.5125000000000006" data-y="-37.1875" x="112.79999999999998" y="1322.75" width="60.20000000000002" height="18.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="2.41875" data-y="-42.1875" x="142.66666666666666" y="1416.0833333333335" width="71.63333333333335" height="18.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="3.3125000000000004" data-y="-37.1875" x="173" y="1322.75" width="44.333333333333314" height="18.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="6.11875" data-y="-42.1875" x="214.3" y="1416.0833333333335" width="66.49999999999994" height="18.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="7.09375" data-y="-37.1875" x="236" y="1322.75" width="59.5" height="18.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="9.4" data-y="-42.1875" x="280.79999999999995" y="1416.0833333333335" width="56.00000000000006" height="18.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="9.79375" data-y="-37.1875" x="295.5" y="1322.75" width="41.299999999999955" height="18.666666666666515" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="20" data-y="-28.775" x="497.3333333333333" y="1061.4166666666665" width="18.666666666666686" height="227.26666666666688" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="20" data-y="-19.4375" x="497.3333333333333" y="958.75" width="18.666666666666686" height="84" fill="#dbeafe" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="-0.2999999999999998" data-y="-42.1875" x="112.79999999999998" y="1416.0833333333335" width="29.866666666666674" height="18.666666666666515" fill="#fef3c7" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="5" data-y="-37.1875" x="217.33333333333331" y="1322.75" width="18.666666666666686" height="18.666666666666515" fill="#fef3c7" stroke="black" stroke-width="0.05357142857142857"/></g><g><rect data-type="rect" data-label="node" data-x="20" data-y="-22.1875" x="497.3333333333333" y="1042.75" width="18.666666666666686" height="18.666666666666515" fill="#fef3c7" stroke="black" stroke-width="0.05357142857142857"/></g><text data-type="text" data-label="Layer z=0" data-x="0" data-y="28.25" x="133.33333333333331" y="110.58333333333326" fill="black" font-size="9.333333333333334" font-family="sans-serif" text-anchor="end" dominant-baseline="text-before-edge">Layer z=0</text><text data-type="text" data-label="Layer z=1" data-x="0" data-y="-13.9375" x="133.33333333333331" y="898.0833333333333" fill="black" font-size="9.333333333333334" font-family="sans-serif" text-anchor="end" dominant-baseline="text-before-edge">Layer z=1</text><g id="crosshair" style="display: none"><line id="crosshair-h" y1="0" y2="1620" stroke="#666" stroke-width="0.5"/><line id="crosshair-v" x1="0" x2="640" stroke="#666" stroke-width="0.5"/><text id="coordinates" font-family="monospace" font-size="12" fill="#666"></text></g><script><![CDATA[
|
|
2
|
+
document.currentScript.parentElement.addEventListener('mousemove', (e) => {
|
|
3
|
+
const svg = e.currentTarget;
|
|
4
|
+
const rect = svg.getBoundingClientRect();
|
|
5
|
+
const x = e.clientX - rect.left;
|
|
6
|
+
const y = e.clientY - rect.top;
|
|
7
|
+
const crosshair = svg.getElementById('crosshair');
|
|
8
|
+
const h = svg.getElementById('crosshair-h');
|
|
9
|
+
const v = svg.getElementById('crosshair-v');
|
|
10
|
+
const coords = svg.getElementById('coordinates');
|
|
11
|
+
|
|
12
|
+
crosshair.style.display = 'block';
|
|
13
|
+
h.setAttribute('x1', '0');
|
|
14
|
+
h.setAttribute('x2', '640');
|
|
15
|
+
h.setAttribute('y1', y);
|
|
16
|
+
h.setAttribute('y2', y);
|
|
17
|
+
v.setAttribute('x1', x);
|
|
18
|
+
v.setAttribute('x2', x);
|
|
19
|
+
v.setAttribute('y1', '0');
|
|
20
|
+
v.setAttribute('y2', '1620');
|
|
21
|
+
|
|
22
|
+
// Calculate real coordinates using inverse transformation
|
|
23
|
+
const matrix = {"a":18.666666666666668,"c":0,"e":133.33333333333331,"b":0,"d":-18.666666666666668,"f":637.9166666666666};
|
|
24
|
+
// Manually invert and apply the affine transform
|
|
25
|
+
// Since we only use translate and scale, we can directly compute:
|
|
26
|
+
// x' = (x - tx) / sx
|
|
27
|
+
// y' = (y - ty) / sy
|
|
28
|
+
const sx = matrix.a;
|
|
29
|
+
const sy = matrix.d;
|
|
30
|
+
const tx = matrix.e;
|
|
31
|
+
const ty = matrix.f;
|
|
32
|
+
const realPoint = {
|
|
33
|
+
x: (x - tx) / sx,
|
|
34
|
+
y: (y - ty) / sy // Flip y back since we used negative scale
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
coords.textContent = `(${realPoint.x.toFixed(2)}, ${realPoint.y.toFixed(2)})`;
|
|
38
|
+
coords.setAttribute('x', (x + 5).toString());
|
|
39
|
+
coords.setAttribute('y', (y - 5).toString());
|
|
40
|
+
});
|
|
41
|
+
document.currentScript.parentElement.addEventListener('mouseleave', () => {
|
|
42
|
+
document.currentScript.parentElement.getElementById('crosshair').style.display = 'none';
|
|
43
|
+
});
|
|
44
|
+
]]></script></svg>
|