Changeset 15877 in josm

Timestamp:

2020-02-17T16:53:03+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18730 - BBox should allow adding a latlon with some extra space (patch by taylor.smock)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/BBox.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/BBox.java

@@ -179 +179 @@
 
     /**
+     * Extends this bbox to include the bbox of the primitive extended by extraSpace.
+     * @param latLon a LatLon
+     * @param extraSpace the value to extend the primitives bbox. Unit is in LatLon degrees.
+     * @since 15877
+     */
+    public void addLatLon(LatLon latLon, double extraSpace) {
+        Objects.requireNonNull(latLon, "LatLon cannot be null");
+        add(latLon);
+        add(latLon.getX() - extraSpace, latLon.getY() - extraSpace);
+        add(latLon.getX() + extraSpace, latLon.getY() + extraSpace);
+    }
+
+    /**
      * Gets the height of the bbox.
      * @return The difference between ymax and ymin. 0 for invalid bboxes.

trunk/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java

@@ -127 +127 @@
 
     /**
+     * Unit test of {@link BBox#addLatLon} method.
+     */
+    @Test
+    public void testAddLatLonBuffer() {
+        BBox b = new BBox();
+        b.addLatLon(LatLon.NORTH_POLE, 0.5);
+        assertEquals(LatLon.NORTH_POLE, b.getCenter());
+        assertEquals(new LatLon(90.5, -0.5), b.getTopLeft());
+        assertEquals(new LatLon(89.5, +0.5), b.getBottomRight());
+    }
+
+    /**
      * Unit test of {@link BBox#add(double, double)} method.
      */