Modify code to take advantage of some newer JOSM features (>r15470, November 2019)

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

src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnable.java

@@ -140,9 +140,6 @@ public class GetDataRunnable extends RecursiveTask<DataSet> implements CancelLis
      */
     public static void cleanup(DataSet dataSet, Bounds bounds) {
         synchronized (LOCK) {
-            /* Microsoft buildings don't have a source, so we add one */
-            // MapWithAIDataUtils.addSourceTags(dataSet, "building",
-            // "microsoft/BuildingFootprints");
             removeRedundantSource(dataSet);
             replaceTags(dataSet);
             removeCommonTags(dataSet);
@@ -297,7 +294,7 @@ public class GetDataRunnable extends RecursiveTask<DataSet> implements CancelLis
             final BBox bbox = new BBox();
             bbox.addPrimitive(n1, 0.001);
             final List<Node> nearbyNodes = dataSet.searchNodes(bbox).parallelStream().filter(node -> !node.isDeleted()
-                    && !node.equals(n1)
+                    && !node.equals(n1) && node.getReferrers().parallelStream().allMatch(prim -> prim.hasKey("highway"))
                     && (((n1.getKeys().equals(node.getKeys()) || n1.getKeys().isEmpty() || node.getKeys().isEmpty())
                             && (n1.getCoor().greatCircleDistance(node.getCoor()) < MapWithAIPreferenceHelper
                                     .getMaxNodeDistance()))

src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/OsmReaderCustom.java

@@ -21,7 +21,6 @@ import org.openstreetmap.josm.tools.Logging;
  * entered, and it must point to the end of the same element, when it is exited.
  */
 public class OsmReaderCustom extends OsmReader {
-    boolean temporaryConvertUknownToTags;
     protected OsmReaderCustom(boolean convertUnknownToTags) {
         // Restricts visibility
         super(convertUnknownToTags);