Add 4-layer e2e routing test

lib/data-structures/ObstacleTree.ts

@@ -20,7 +20,10 @@ export class ObstacleSpatialHashIndex {
     obstacles: Obstacle[] = [],
   ) {
     if (implementation === "flatbush") {
-      this.idx = new FlatbushIndex<Obstacle>(obstacles.length)
+      this.idx =
+        obstacles.length === 0
+          ? new RbushIndex<Obstacle>()
+          : new FlatbushIndex<Obstacle>(obstacles.length)
     } else if (implementation === "rbush") {
       this.idx = new RbushIndex<Obstacle>()
     } else {
@@ -50,7 +53,8 @@ export class ObstacleSpatialHashIndex {
 
     // bulk-load initial obstacles
     obstacles.forEach((o) => this.insert(o))
-    if (implementation === "flatbush") this.idx.finish?.()
+    if (implementation === "flatbush" && obstacles.length > 0)
+      this.idx.finish?.()
   }
 
   insert(o: Obstacle) {

tests/core3.test.tsx

@@ -47,4 +47,4 @@ test("core3 - 0402 columns", async () => {
   expect(convertCircuitJsonToPcbSvg(circuitJson)).toMatchSvgSnapshot(
     import.meta.path,
   )
-})
+}, 20_000)

tests/e2e3_4layer.test.ts

@@ -0,0 +1,37 @@
+import { expect, test } from "bun:test"
+import { CapacityMeshSolver } from "../lib"
+import type { SimpleRouteJson } from "lib/types"
+import { convertSrjToGraphicsObject } from "./fixtures/convertSrjToGraphicsObject"
+
+test("routes a simple 4-layer board", () => {
+  const srj: SimpleRouteJson = {
+    layerCount: 4,
+    minTraceWidth: 0.15,
+    obstacles: [],
+    connections: [
+      {
+        name: "conn1",
+        pointsToConnect: [
+          { x: 1, y: 1, layer: "top" },
+          { x: 9, y: 9, layer: "bottom" },
+        ],
+      },
+      {
+        name: "conn2",
+        pointsToConnect: [
+          { x: 1, y: 9, layer: "top" },
+          { x: 9, y: 1, layer: "bottom" },
+        ],
+      },
+    ],
+    bounds: { minX: 0, maxX: 10, minY: 0, maxY: 10 },
+  }
+
+  const solver = new CapacityMeshSolver(srj)
+  solver.solve()
+  const result = solver.getOutputSimpleRouteJson()
+
+  expect(convertSrjToGraphicsObject(result)).toMatchGraphicsSvg(
+    import.meta.path,
+  )
+})

tests/fixtures/convertSrjToGraphicsObject.ts

@@ -10,7 +10,7 @@ export const convertSrjToGraphicsObject = (srj: SimpleRouteJson) => {
   const points: Point[] = []
 
   const colorMap: Record<string, string> = getColorMap(srj)
-  const layerCount = 2
+  const layerCount = srj.layerCount ?? 2
 
   // Add points for each connection's pointsToConnect
   if (srj.connections) {
@@ -66,7 +66,9 @@ export const convertSrjToGraphicsObject = (srj: SimpleRouteJson) => {
                 bottom: "blue",
                 inner1: "green",
                 inner2: "yellow",
-              }[routePoint.layer]!,
+                inner3: "purple",
+                inner4: "orange",
+              }[routePoint.layer] ?? "black",
               0.5,
             ),
             // For some reason this is too small, likely a graphics-debug bug