From b2b22a700de2ad704ef84ea7dcb932eaec9a5ac4 Mon Sep 17 00:00:00 2001 From: Taylor Smock Date: Tue, 13 Apr 2021 08:01:45 -0600 Subject: [PATCH] Fix JOSM-20753 -- fallout from JOSM r17752 Signed-off-by: Taylor Smock --- .../mapwithai/data/validation/tests/StreetAddressOrder.java | 4 ++-- .../mapwithai/data/validation/tests/StreetAddressTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrder.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrder.java index 4ec22e3..eff5145 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrder.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrder.java @@ -64,7 +64,7 @@ public class StreetAddressOrder extends Test { * @return The primitives that have appropriate addr tags near to the way */ public static List getNearbyAddresses(Way way) { - BBox bbox = StreetAddressTest.expandBBox(way.getBBox(), StreetAddressTest.BBOX_EXPANSION); + BBox bbox = StreetAddressTest.expandBBox(new BBox(way.getBBox()), StreetAddressTest.BBOX_EXPANSION); List addrNodes = way.getDataSet().searchNodes(bbox).parallelStream() .filter(StreetAddressTest::hasStreetAddressTags).collect(Collectors.toList()); List addrWays = way.getDataSet().searchWays(bbox).parallelStream() @@ -83,7 +83,7 @@ public class StreetAddressOrder extends Test { * @return {@code true} if the primitive is the nearest way */ public static boolean isNearestRoad(Way way, OsmPrimitive prim) { - BBox primBBox = StreetAddressTest.expandBBox(prim.getBBox(), StreetAddressTest.BBOX_EXPANSION); + BBox primBBox = StreetAddressTest.expandBBox(new BBox(prim.getBBox()), StreetAddressTest.BBOX_EXPANSION); List> sorted = way.getDataSet().searchWays(primBBox).parallelStream() .filter(StreetAddressTest::isHighway).map(iway -> StreetAddressTest.distanceToWay(iway, prim)) .sorted(Comparator.comparing(p -> p.b)).collect(Collectors.toList()); diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTest.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTest.java index ba500b2..92e9bab 100644 --- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTest.java +++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTest.java @@ -101,7 +101,7 @@ public class StreetAddressTest extends Test { public static Collection getSurroundingHighways(OsmPrimitive address) { Objects.requireNonNull(address.getDataSet(), "Node must be part of a dataset"); DataSet ds = address.getDataSet(); - BBox addrBox = expandBBox(address.getBBox(), BBOX_EXPANSION); + BBox addrBox = expandBBox(new BBox(address.getBBox()), BBOX_EXPANSION); int expansions = 0; int maxExpansions = Config.getPref().getInt("mapwithai.validator.streetaddresstest.maxexpansions", 20); while (ds.searchWays(addrBox).parallelStream().filter(StreetAddressTest::isHighway).count() == 0