@pooder/kit 5.3.0 → 5.3.1

package/src/extensions/tracer.ts

@@ -306,14 +306,10 @@ export class ImageTracer {
 
     const baseUnpaddedContours = baseContours
       .map((contour) =>
-        this.clampPointsToImageBounds(
-          contour.map((p) => ({
-            x: p.x - padding,
-            y: p.y - padding,
-          })),
-          width,
-          height,
-        ),
+        contour.map((p) => ({
+          x: p.x - padding,
+          y: p.y - padding,
+        })),
       )
       .filter((contour) => contour.length > 2);
 
@@ -418,6 +414,49 @@ export class ImageTracer {
       );
     }
 
+    if (expand > 0) {
+      const expectedExpandedBounds = {
+        x: baseBounds.x - expand,
+        y: baseBounds.y - expand,
+        width: baseBounds.width + expand * 2,
+        height: baseBounds.height + expand * 2,
+      };
+      if (
+        expectedExpandedBounds.width > 0 &&
+        expectedExpandedBounds.height > 0 &&
+        globalBounds.width > 0 &&
+        globalBounds.height > 0
+      ) {
+        const shouldNormalizeExpandBounds =
+          Math.abs(globalBounds.x - expectedExpandedBounds.x) > 1 ||
+          Math.abs(globalBounds.y - expectedExpandedBounds.y) > 1 ||
+          Math.abs(globalBounds.width - expectedExpandedBounds.width) > 1 ||
+          Math.abs(globalBounds.height - expectedExpandedBounds.height) > 1;
+        if (shouldNormalizeExpandBounds) {
+          const beforeNormalize = globalBounds;
+          finalContours = this.translateContours(
+            this.scaleContours(
+              finalContours,
+              expectedExpandedBounds.width,
+              expectedExpandedBounds.height,
+              globalBounds,
+            ),
+            expectedExpandedBounds.x,
+            expectedExpandedBounds.y,
+          );
+          globalBounds = this.boundsFromPoints(
+            this.flattenContours(finalContours),
+          );
+          debugLog("traceWithBounds:expand-normalized", {
+            expand,
+            expectedExpandedBounds,
+            beforeNormalize,
+            afterNormalize: globalBounds,
+          });
+        }
+      }
+    }
+
     // Simplify and Generate SVG
     debugLog("traceWithBounds:contours", {
       baseContourCount: baseContoursRaw.length,
@@ -892,17 +931,17 @@ export class ImageTracer {
     );
   }
 
-  private static clampPointsToImageBounds(
-    points: Point[],
-    width: number,
-    height: number,
-  ): Point[] {
-    const maxX = Math.max(0, width);
-    const maxY = Math.max(0, height);
-    return points.map((p) => ({
-      x: Math.max(0, Math.min(maxX, p.x)),
-      y: Math.max(0, Math.min(maxY, p.y)),
-    }));
+  private static translateContours(
+    contours: Point[][],
+    offsetX: number,
+    offsetY: number,
+  ): Point[][] {
+    return contours.map((points) =>
+      points.map((p) => ({
+        x: p.x + offsetX,
+        y: p.y + offsetY,
+      })),
+    );
   }
 
   private static pointsToSVG(points: Point[]): string {