Merge branch 'master' into feature/compare

diylc/diylc-core/src/main/java/org/diylc/presenter/DrawingManager.java

@@ -885,8 +885,13 @@ public class DrawingManager {
     List<ContinuityArea> continuityAreas = getContinuityAreas();
     Stroke s = ObjectCache.getInstance().fetchBasicStroke(threshold - 1); // value eyeballed for
                                                                           // approx good results
-    List<Area> expanded = continuityAreas.parallelStream()
-        .map((a) -> new Area(s.createStrokedShape(a.getArea()))).collect(Collectors.toList());
+
+    List<Area> areas = new ArrayList<>(continuityAreas.stream().map(ContinuityArea::getArea).toList());
+    AreaUtils.crunchAreas(areas, null);
+
+    List<Area> expanded = areas.parallelStream()
+        .map((a) -> new Area(s.createStrokedShape(a))).toList();
+
     List<Area> intersections = new ArrayList<Area>();
     for (int i = 0; i < expanded.size() - 1; i++) {
       for (int j = i + 1; j < expanded.size(); j++) {

diylc/diylc-core/src/main/resources/update.xml

@@ -301,6 +301,10 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>Increased tolerance of sticky points on guitar pickup terminals in order to make it easier for leads to make proper contact and for the circuit analyzer to work</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Improved trace proximity calculation to avoid showing false positives</description>
+				</org.diylc.appframework.update.Change>
 				<org.diylc.appframework.update.Change>
 					<changeType>BUG_FIX</changeType>
 					<description>If the internet connection is present, but unstable, the application starts but nothing can be clicked until the connection restores</description>