From 776ce358646378fa0407c6997493e4bbc31b8e17 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Sat, 13 Dec 2025 21:34:08 -0500
Subject: [PATCH] add travel boundary hangover for travel between ops when the
 next has no internal walls

---
 src/kiri/mode/cam/op-register.js |  3 ++-
 src/kiri/mode/cam/prepare.js     | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/kiri/mode/cam/op-register.js b/src/kiri/mode/cam/op-register.js
index a2c22fbe..2742526b 100644
--- a/src/kiri/mode/cam/op-register.js
+++ b/src/kiri/mode/cam/op-register.js
@@ -147,8 +147,9 @@ class OpRegister extends CamOp {
 
     prepare(ops, progress) {
         let { op } = this;
-        let { emitDrills, setDrill, setTool } = ops;
+        let { emitDrills, setDrill, setTool, setTravelBoundary } = ops;
 
+        setTravelBoundary();
         if (op.axis === '-' || op.axis === '=') {
             setTool(op.tool, op.feed, op.rate);
             for (let slice of this.sliceOut) {
diff --git a/src/kiri/mode/cam/prepare.js b/src/kiri/mode/cam/prepare.js
index 2e5ddf8e..8c1bd591 100644
--- a/src/kiri/mode/cam/prepare.js
+++ b/src/kiri/mode/cam/prepare.js
@@ -116,10 +116,11 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
         isLathe,
         isIndex,
         layerOut = [],
-        lastOp,
-        lastTool,
         lasering = false,
         laserPower = 0,
+        lastOp,
+        lastTool,
+        lastTravelBounds,
         newOutput = print.output || [],
         nextIsMove = true,
         plungeRate = camFastFeedZ,
@@ -164,6 +165,7 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
     function setContouring(bool, step) {
         contouring = bool;
         toolDiamMove = step ?? tool.getStepSize(currentOp.step) * 2;
+        if (bool) setTravelBoundary();
     }
 
     function setSpindle(speed) {
@@ -482,7 +484,9 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
         } else
         // check move against a known boundary (pocketing)
         if (isMove && travelBounds) {
-            for (let poly of travelBounds) {
+            // travel boundary "hangover" from last area op when traveling between
+            let check = lastTravelBounds ? [...lastTravelBounds, ...travelBounds] : travelBounds;
+            for (let poly of check) {
                 let ints = poly.intersections(
                     toWidgetCoords(printPoint),
                     toWidgetCoords(point)
@@ -493,6 +497,7 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
                     break;
                 }
             }
+            lastTravelBounds = undefined;
         } else
         // for longer moves, check the terrain to see if we need to go up and over
         if (isMove) {
@@ -547,13 +552,10 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
     }
 
     function setTravelBoundary(polys) {
+        lastTravelBounds = travelBounds;
         travelBounds = POLY.flatten(polys);
     }
 
-    function clearTravelBoundary() {
-        travelBounds = undefined;
-    }
-
     /**
      * output an array of slices that form a pocket
      * used by rough and pocket ops
@@ -604,8 +606,6 @@ export async function prepare_one(widget, settings, print, firstPoint, update) {
                 descend(depthData.slice(i));
             }
         }
-
-        clearTravelBoundary();
     }
 
     function descend(stack, inside) {