From 0ea652f46dde0af1af3dbf697be442a9ca4b7864 Mon Sep 17 00:00:00 2001
From: Taylor Smock <tsmock@fb.com>
Date: Tue, 9 Nov 2021 10:12:47 -0700
Subject: [PATCH] MergeAddressBuildings: Consider any node with an `addr:` tag
 to be an address node

Signed-off-by: Taylor Smock <tsmock@fb.com>
---
 .../josm/plugins/mapwithai/commands/MergeAddressBuildings.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/commands/MergeAddressBuildings.java b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/commands/MergeAddressBuildings.java
index a390bd3..e7dacae 100644
--- a/src/main/java/org/openstreetmap/josm/plugins/mapwithai/commands/MergeAddressBuildings.java
+++ b/src/main/java/org/openstreetmap/josm/plugins/mapwithai/commands/MergeAddressBuildings.java
@@ -83,7 +83,7 @@ public class MergeAddressBuildings extends AbstractConflationCommand {
         final Collection<IPrimitive> nodesInside = Geometry.filterInsideAnyPolygon(toCheck, object);
 
         final List<Node> nodesWithAddresses = nodesInside.stream().filter(Node.class::isInstance).map(Node.class::cast)
-                .filter(node -> node.hasKey("addr:housenumber", "addr:housename", "addr:postcode"))
+                .filter(node -> node.keySet().stream().anyMatch(str -> str.startsWith("addr:")))
                 .collect(Collectors.toList());
 
         final List<Command> commandList = new ArrayList<>();