fix: increase PixelPadding to 200 (#2723)

* fix: increase PixelPadding to 200

* fix: make tests pass

* fix: remove stray console.log

Author: Andrew Jacombs

packages/cli/src/cog/__tests__/cutline.test.ts

@@ -249,21 +249,17 @@ o.spec('cutline', () => {
         8,
       );
 
-      o(round(cutline.clipPoly, 4)).deepEquals([
-        [
-          [
-            [19468580.0838, -4993280.8853],
-            [19471098.3762, -4993280.8853],
-            [19471932.5568, -4992600.0637],
-            [19472092.0139, -4992352.6942],
-            [19472092.0139, -4987203.6846],
-            [19471983.8261, -4987203.6846],
-            [19470978.4379, -4989417.4454],
-            [19468800.9775, -4991497.5405],
-            [19468580.0838, -4991792.2037],
-            [19468580.0838, -4993280.8853],
-          ],
-        ],
+      o(round(cutline.clipPoly, 4)[0][0]).deepEquals([
+        [19468576.3516, -4993284.6176],
+        [19471093.8032, -4993284.6176],
+        [19471932.5568, -4992600.0637],
+        [19472095.7462, -4992346.9043],
+        [19472095.7462, -4987199.9524],
+        [19471985.5211, -4987199.9524],
+        [19470978.4379, -4989417.4454],
+        [19468800.9775, -4991497.5405],
+        [19468576.3516, -4991797.1824],
+        [19468576.3516, -4993284.6176],
       ]);
 
       o(covering.map((c) => c.name)).deepEquals([
@@ -297,17 +293,13 @@ o.spec('cutline', () => {
         8,
       );
 
-      o(round(cutline.clipPoly, 4)).deepEquals([
-        [
-          [
-            [19470015.7313, -4990337.1045],
-            [19472091.9684, -4990337.1045],
-            [19472091.9684, -4987203.6846],
-            [19471983.8261, -4987203.6846],
-            [19470978.4379, -4989417.4454],
-            [19470015.7313, -4990337.1045],
-          ],
-        ],
+      o(round(cutline.clipPoly, 4)[0][0]).deepEquals([
+        [19470011.8243, -4990340.8368],
+        [19472095.7007, -4990340.8368],
+        [19472095.7007, -4987199.9524],
+        [19471985.5211, -4987199.9524],
+        [19470978.4379, -4989417.4454],
+        [19470011.8243, -4990340.8368],
       ]);
 
       o(covering.map((c) => c.name)).deepEquals([

packages/cli/src/cog/cutline.ts

@@ -14,7 +14,7 @@ import { AlignedLevel, CoveringFraction } from './constants.js';
 import { CogJob, FeatureCollectionWithCrs, SourceMetadata } from './types.js';
 
 /** Padding to always apply to image boundies */
-const PixelPadding = 100;
+const PixelPadding = 200;
 
 /** fraction to scale source imagery to avoid degenerate edges */
 const SourceSmoothScale = 1 + 1e-8;
@@ -296,11 +296,9 @@ export class Cutline {
      */
   private padBounds(bounds: Bounds, resZoom: number): Bounds {
     const px = this.tileMatrix.pixelScale(resZoom);
-    const pixelPadding = px > 1 ? PixelPadding * 2 : PixelPadding; //Double the padding to remove the white edges for low resolution imagery.
-
     // Ensure cutline blend does not interferre with non-costal edges
-    const widthScale = (bounds.width + px * (pixelPadding + this.blend) * 2) / bounds.width;
-    const heightScale = (bounds.height + px * (pixelPadding + this.blend) * 2) / bounds.height;
+    const widthScale = (bounds.width + px * (PixelPadding + this.blend) * 2) / bounds.width;
+    const heightScale = (bounds.height + px * (PixelPadding + this.blend) * 2) / bounds.height;
     return bounds.scaleFromCenter(widthScale, heightScale);
   }
 }