QuadTreeMeta: only log a warning when "Proposed rect has such extreme aspect ratio that it would be zero-width at preferredZoom"

a fatal error is too extreme for such a self-solving problem

Author: risicle

src/org/openstreetmap/josm/plugins/markseen/QuadTreeMeta.java

@@ -18,6 +18,7 @@
 import java.awt.image.IndexColorModel;
 import java.awt.image.WritableRaster;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 
 public class QuadTreeMeta {
@@ -119,7 +120,11 @@ public MarkBoundsSeenRequest(Bounds bounds_, double minTilesAcross_, boolean che
 
         @Override
         public void run() {
-            QuadTreeMeta.this.quadTreeRoot.markBoundsSeen(this.bounds, this.minTilesAcross);
+            try {
+                QuadTreeMeta.this.quadTreeRoot.markBoundsSeen(this.bounds, this.minTilesAcross);
+            } catch (QuadTreeNode.ExtremeAspectRatioException e) {
+                Main.warn(e.getMessage());
+            }
             if (this.checkIntegrity) {
                 QuadTreeMeta.this.quadTreeRoot.checkIntegrity();
             }

src/org/openstreetmap/josm/plugins/markseen/QuadTreeNode.java

@@ -17,6 +17,12 @@
 import org.openstreetmap.josm.data.Bounds;
 
 class QuadTreeNode {
+    public static class ExtremeAspectRatioException extends UnsupportedOperationException {
+        public ExtremeAspectRatioException() {
+            super("Proposed rect has such extreme aspect ratio that it would be zero-width at preferredZoom");
+        }
+    }
+
     private SoftReference<BufferedImage> mask;
     private BufferedImage canonicalMask;
 
@@ -486,9 +492,7 @@ public void markBoundsSeen(Bounds bbox, double minTilesAcross) {
         double y1s = Math.rint(y1*preferredZoomFactor)/preferredZoomFactor;
 
         if (x0s == x1s || y0s == y1s) {
-            throw new UnsupportedOperationException(
-                "Proposed rect has such extreme aspect ratio that it would be zero-width at preferredZoom"
-            );
+            throw new ExtremeAspectRatioException();
         }
 
         this.markRectSeenInner(

test/unit/org/openstreetmap/josm/plugins/markseen/QuadTreeNodeExtremeAspectRatioTest.java

@@ -0,0 +1,53 @@
+package org.openstreetmap.josm.plugins.markseen;
+
+import java.io.IOException;
+import java.lang.Math;
+import java.util.Arrays;
+import java.util.Collection;
+
+import java.awt.Color;
+
+import org.openstreetmap.josm.data.Bounds;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+
+@RunWith(Parameterized.class)
+public class QuadTreeNodeExtremeAspectRatioTest extends BaseTest {
+    @Parameters()
+    public static Collection<Object[]> getParameters() throws IOException {
+        return Arrays.asList(scenarios);
+    }
+
+    protected final static Object[][] scenarios = new Object[][] {
+        { 256, new Bounds(51.36, -0.35, 51.3601, 0.10), 1.1 },
+        { 128, new Bounds(20.22, -35.2, 20.23, -35.1999999), 4.2 },
+        { 161, new Bounds(-0.0001, -1.0, 0.0001, 1.0), 8.3 },
+        { 161, new Bounds(-1.0001, -1.0, -0.9999, 1.0), 8.3 }
+    };
+
+    protected final int tileSize;
+    protected final Bounds bounds;
+    protected final double minTilesAcross;
+
+    public QuadTreeNodeExtremeAspectRatioTest(int tileSize_, Bounds bounds_, double minTilesAcross_) {
+        this.tileSize = tileSize_;
+        this.bounds = bounds_;
+        this.minTilesAcross = minTilesAcross_;
+    }
+
+    @Test(expected=QuadTreeNode.ExtremeAspectRatioException.class)
+    public void test() {
+        QuadTreeMeta quadTreeMeta = new QuadTreeMeta(this.tileSize, Color.PINK, 0.5);
+        quadTreeMeta.quadTreeRWLock.writeLock().lock();
+
+        try {
+            quadTreeMeta.quadTreeRoot.markBoundsSeen(this.bounds, this.minTilesAcross);
+        } finally {
+            quadTreeMeta.quadTreeRWLock.writeLock().unlock();
+        }
+    }
+}