Add method to merge buildings with addresses

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>

.classpath

@@ -19,5 +19,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="/JOSM/test/lib/awaitility-3.1.5.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM-utilsplugin2"/>
 	<classpathentry kind="output" path="build/classes/java/main"/>
 </classpath>

gradle.properties

@@ -11,5 +11,7 @@ plugin.class = org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin
 plugin.link = https://gitlab.com/gokaart/JOSM_MapWithAI
 plugin.description = Allows the use of MapWithAI data in JOSM (same data as used in RapiD) (currently VERY rudimentary)
 
+plugin.requires = utilsplugin2
+
 # This is due to changing the name of the plugin
 plugin.provides = rapid

src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/commands/conflation/MergeAddressBuildings.java

@@ -0,0 +1,94 @@
+package org.openstreetmap.josm.plugins.mapwithai.backend.commands.conflation;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.mapwithai.backend.MapWithAIPreferenceHelper;
+import org.openstreetmap.josm.plugins.utilsplugin2.replacegeometry.ReplaceGeometryUtils;
+import org.openstreetmap.josm.tools.Geometry;
+
+public class MergeAddressBuildings extends AbstractConflationCommand {
+    private static final String BUILDING_KEY = "building";
+
+    public MergeAddressBuildings(DataSet data) {
+        super(data);
+    }
+
+    @Override
+    public String getDescriptionText() {
+        return tr("Merge added buildings with existing address nodes");
+    }
+
+    @Override
+    public Collection<Class<? extends OsmPrimitive>> getInterestedTypes() {
+        return Arrays.asList(Way.class, Relation.class);
+    }
+
+    @Override
+    public String getKey() {
+        return BUILDING_KEY;
+    }
+
+    @Override
+    public Command getRealCommand() {
+        List<Command> commands = new ArrayList<>();
+        if (MapWithAIPreferenceHelper.isMergeBuildingAddress()) {
+            possiblyAffectedPrimitives.stream().filter(Way.class::isInstance).map(Way.class::cast)
+            .filter(way -> way.hasKey(BUILDING_KEY)).filter(Way::isClosed)
+            .forEach(way -> commands.addAll(mergeAddressBuilding(getAffectedDataSet(), way)));
+
+            possiblyAffectedPrimitives.stream().filter(Relation.class::isInstance).map(Relation.class::cast)
+            .filter(rel -> rel.hasKey(BUILDING_KEY)).filter(Relation::isMultipolygon)
+            .forEach(rel -> commands.addAll(mergeAddressBuilding(getAffectedDataSet(), rel)));
+        }
+
+        Command returnCommand;
+        if (!commands.isEmpty()) {
+            returnCommand = new SequenceCommand(getDescriptionText(), commands);
+        } else {
+            returnCommand = null;
+        }
+        return returnCommand;
+    }
+
+    private Collection<? extends Command> mergeAddressBuilding(DataSet affectedDataSet, Relation rel) {
+        List<IPrimitive> toCheck = new ArrayList<>();
+        toCheck.addAll(affectedDataSet.searchNodes(rel.getBBox()));
+        Collection<IPrimitive> nodesInside = Geometry.filterInsideMultipolygon(toCheck, rel);
+        List<Node> nodesWithAddresses = nodesInside.stream().filter(Node.class::isInstance).map(Node.class::cast)
+                .filter(node -> node.hasKey("addr:housenumber", "addr:housename")).collect(Collectors.toList());
+
+        List<Command> commandList = new ArrayList<>();
+        if (nodesWithAddresses.size() == 1) {
+            commandList.add(ReplaceGeometryUtils.buildUpgradeNodeCommand(nodesWithAddresses.get(0), rel));
+        }
+        return commandList;
+    }
+
+    private Collection<? extends Command> mergeAddressBuilding(DataSet affectedDataSet, Way way) {
+        List<IPrimitive> toCheck = new ArrayList<>();
+        toCheck.addAll(affectedDataSet.searchNodes(way.getBBox()));
+        Collection<IPrimitive> nodesInside = Geometry.filterInsidePolygon(toCheck, way);
+        List<Node> nodesWithAddresses = nodesInside.stream().filter(Node.class::isInstance).map(Node.class::cast)
+                .filter(node -> node.hasKey("addr:housenumber", "addr:housename")).collect(Collectors.toList());
+
+        List<Command> commandList = new ArrayList<>();
+        if (nodesWithAddresses.size() == 1) {
+            commandList.add(ReplaceGeometryUtils.buildUpgradeNodeCommand(nodesWithAddresses.get(0), way));
+        }
+        return commandList;
+    }
+}

src/main/java/org/openstreetmap/josm/plugins/mapwithai/commands/CreateConnectionsCommand.java

@@ -20,6 +20,7 @@ import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
 import org.openstreetmap.josm.plugins.mapwithai.backend.commands.conflation.AbstractConflationCommand;
 import org.openstreetmap.josm.plugins.mapwithai.backend.commands.conflation.ConnectedCommand;
 import org.openstreetmap.josm.plugins.mapwithai.backend.commands.conflation.DuplicateCommand;
+import org.openstreetmap.josm.plugins.mapwithai.backend.commands.conflation.MergeAddressBuildings;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -30,6 +31,7 @@ public class CreateConnectionsCommand extends Command {
     static {
         conflationCommands.add(ConnectedCommand.class);
         conflationCommands.add(DuplicateCommand.class);
+        conflationCommands.add(MergeAddressBuildings.class);
     }
 
     public CreateConnectionsCommand(DataSet data, Collection<OsmPrimitive> primitives) {