#368 improve old/new edge comparison

vmarc · Jul 20, 2024 · 7d04562 · 7d04562
1 parent 795a625
commit 7d04562
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/server/src/main/scala/kpn/core/tools/next/support/RouteAnalysisCompareTool.scala b/server/src/main/scala/kpn/core/tools/next/support/RouteAnalysisCompareTool.scala
@@ -27,9 +27,9 @@ class RouteAnalysisCompareTool(config: AnalysisStartConfiguration) {
 
   def analyze(): Unit = {
     log.info("Collecting routeIds")
-    val routeIds = config.oldDatabase.oldRoutes.ids()
-    // val routeIds = readRouteIds("logs/mismatch-ids-5.txt")
-    // val routeIds = Seq(17613906L)
+    // val routeIds = config.oldDatabase.oldRoutes.ids()
+    // val routeIds = readRouteIds("logs/mismatch-ids-7.txt")
+    val routeIds = Seq(17402807L)
     log.info(s"Comparing ${routeIds.size} routes")
     routeIds.zipWithIndex.foreach { case (routeId, index) =>
       if (index % 50 == 0) {

diff --git a/server/src/main/scala/kpn/core/tools/next/support/RouteAnalysisTool.scala b/server/src/main/scala/kpn/core/tools/next/support/RouteAnalysisTool.scala
@@ -70,7 +70,7 @@ class RouteAnalysisTool(config: AnalysisStartConfiguration) {
     // analyzeRoutes(essenOkRouteIds)
     // analyzeRoutes(law9)
     // analyzeRoutes(Seq(13844575L))
-    analyzeRoutes(Seq(17613906L)) // exception during structure analysis
+    analyzeRoutes(Seq(17402807L)) // exception during structure analysis
     // analyzeRoutes(Seq(3952592)) // broken route
     // analyzeRoutes(Seq(3963819)) // route with roundabout
     buildTiles()

diff --git a/server/src/main/scala/kpn/core/tools/next/support/compare/CompareEdges.scala b/server/src/main/scala/kpn/core/tools/next/support/compare/CompareEdges.scala
@@ -23,6 +23,10 @@ class CompareEdges(oldRouteDoc: OldRouteDoc, newRouteDoc: RouteDetailDoc, log: L
       // cannot compare edges
       return
     }
+    if (oldRouteDoc.edges.isEmpty && newRouteDoc.edges.nonEmpty) {
+      // new analysis found edges: assume new edges better than old
+      return
+    }
 
     val oldEdges = oldCompareEdges()
     val newEdges = newCompareEdges()
@@ -74,9 +78,10 @@ class CompareEdges(oldRouteDoc: OldRouteDoc, newRouteDoc: RouteDetailDoc, log: L
 
   private def edgesEqual(oldEdges: Seq[CompareEdge], newEdges: Seq[CompareEdge]): Boolean = {
     if (oldEdges.size == newEdges.size) {
-      oldEdges.zip(newEdges).forall { case (oldEdge, newEdge) =>
-        edgeEqual(oldEdge, newEdge)
+      val mismatches = oldEdges.filter { oldEdge =>
+        !newEdges.exists(newEdge => edgeEqual(oldEdge, newEdge))
       }
+      mismatches.isEmpty
     }
     else {
       false