#368 migrate structure tests

vmarc · Jul 13, 2024 · a51ecb6 · a51ecb6
1 parent ba18e3f
commit a51ecb6
Show file tree

Hide file tree

Showing 71 changed files with 472 additions and 2,320 deletions.
diff --git a/...rc/main/scala/kpn/server/analyzer/engine/analysis/route/RouteDetailMainAnalyzerImpl.scala b/...rc/main/scala/kpn/server/analyzer/engine/analysis/route/RouteDetailMainAnalyzerImpl.scala
@@ -47,7 +47,6 @@ import kpn.server.analyzer.engine.analysis.route.analyzers.UnexpectedRelationRou
 import kpn.server.analyzer.engine.analysis.route.analyzers.WithoutWaysRouteAnalyzer
 import kpn.server.analyzer.engine.analysis.route.domain.RouteDetailAnalysisContext
 import kpn.server.analyzer.engine.analysis.route.structure.RouteLinkAnalyzer
-import kpn.server.analyzer.engine.analysis.route.structure.RoutePathAnalyzer
 import kpn.server.analyzer.engine.analysis.route.structure.RouteSegmentAnalyzer
 import org.springframework.stereotype.Component
 
@@ -92,7 +91,6 @@ class RouteDetailMainAnalyzerImpl(
         RouteNodeAnalyzer,
         RouteLinkAnalyzer,
         RouteSegmentAnalyzer,
-        RoutePathAnalyzer,
 
         OldRouteSegmentAnalyzer,
         RouteStructureAnalyzer,

diff --git a/...n/scala/kpn/server/analyzer/engine/analysis/route/domain/RouteDetailAnalysisContext.scala b/...n/scala/kpn/server/analyzer/engine/analysis/route/domain/RouteDetailAnalysisContext.scala
@@ -25,7 +25,6 @@ import kpn.server.analyzer.engine.analysis.route.analyzers.RouteAnalysisBuilder
 import kpn.server.analyzer.engine.analysis.route.segment.FragmentMap
 import kpn.server.analyzer.engine.analysis.route.structure.NewRouteSegment
 import kpn.server.analyzer.engine.analysis.route.structure.RouteLinks
-import kpn.server.analyzer.engine.analysis.route.structure.RoutePath
 import kpn.server.analyzer.engine.analysis.route.structure.Structure
 import kpn.server.analyzer.engine.context.ElementIds
 import kpn.server.analyzer.engine.context.PreconditionMissingException
@@ -44,7 +43,6 @@ case class RouteDetailAnalysisContext(
   country: Option[Country] = None,
   _links: Option[RouteLinks] = None,
   _segments: Option[Seq[NewRouteSegment]] = None,
-  _paths: Option[Seq[RoutePath]] = None,
   _segmentAnalysis: Option[RouteSegmentAnalysis] = None,
   routeNodeInfos: Map[Long, RouteNodeInfo] = Map.empty,
   facts: Seq[Fact] = Seq.empty,
@@ -173,8 +171,6 @@ case class RouteDetailAnalysisContext(
 
   def segments: Seq[NewRouteSegment] = _segments.getOrElse(throw new PreconditionMissingException)
 
-  def paths: Seq[RoutePath] = _paths.getOrElse(throw new PreconditionMissingException)
-
   def segmentAnalysis: RouteSegmentAnalysis = _segmentAnalysis.getOrElse(throw new PreconditionMissingException)
 
   def routeNameAnalysis: RouteNameAnalysis = _routeNameAnalysis.getOrElse(throw new PreconditionMissingException)

diff --git a/server/src/main/scala/kpn/server/analyzer/engine/analysis/route/report/RoutePathReport.scala b/server/src/main/scala/kpn/server/analyzer/engine/analysis/route/report/RoutePathReport.scala
@@ -24,19 +24,19 @@ class RoutePathReport(context: RouteDetailAnalysisContext) {
   }
 
   private def paths(): String = {
-    context.paths.map { path =>
-      val fromNode = path.elements.head.fromNetworkNode
-      val toNode = path.elements.last.toNetworkNode
+    context.segments.flatMap(_.elements).map { element =>
+      val fromNode = element.fromNetworkNode
+      val toNode = element.toNetworkNode
       val from = fromNode.map(n => s"${ReportUtil.osmNodeLink(n.node.id)}(${n.name})").getOrElse("")
       val to = toNode.map(n => s"${ReportUtil.osmNodeLink(n.node.id)}(${n.name})").getOrElse("")
-      val elementIds = path.elements.map(element => element.id).mkString(", ")
+      val elementIds = "" + element.id
 
       s"""<tr>
          |  <td>
-         |    Path ${path.id}
+         |    Path ${element.id}
          |  </td>
          |  <td>
-         |    ${path.direction.toString.toLowerCase}
+         |    ${element.direction.toString.toLowerCase}
          |  </td>
          |  <td>
          |    $from

diff --git a/.../src/main/scala/kpn/server/analyzer/engine/analysis/route/report/RouteSegmentReport.scala b/.../src/main/scala/kpn/server/analyzer/engine/analysis/route/report/RouteSegmentReport.scala
@@ -25,7 +25,6 @@ class RouteSegmentReport(context: RouteDetailAnalysisContext) {
        |    <td>from</td>
        |    <td>to</td>
        |    <td>network nodes</td>
-       |    <td>paths</td>
        |  </tr>
        |${segments()}
        |</table>
@@ -46,8 +45,6 @@ class RouteSegmentReport(context: RouteDetailAnalysisContext) {
          |  </td>
          |  <td>
          |  </td>
-         |  <td>
-         |  </td>
          |</tr>
          |${segmentElements(segment)}
          |""".stripMargin
@@ -70,8 +67,6 @@ class RouteSegmentReport(context: RouteDetailAnalysisContext) {
          |  </td>
          |  <td>
          |  </td>
-         |  <td>
-         |  </td>
          |</tr>
          |${elementFragments(element)}
          |""".stripMargin
@@ -115,9 +110,6 @@ class RouteSegmentReport(context: RouteDetailAnalysisContext) {
        |    $to
        |  </td>
        |  <td>${networkNodeString(fragment.nodeIds)}</td>
-       |  <td>
-       |    ${fragment.pathIds.mkString(", ")}
-       |  </td>
        |</tr>
        |""".stripMargin
   }

diff --git a/.../kpn/server/analyzer/engine/analysis/route/structure/NewRouteSegmentElementFragment.scala b/.../kpn/server/analyzer/engine/analysis/route/structure/NewRouteSegmentElementFragment.scala
@@ -7,8 +7,7 @@ case class NewRouteSegmentElementFragment(
   wayId: Long,
   link: Link,
   role: Option[String],
-  nodeIds: Seq[Long],
-  pathIds: Seq[Long]
+  nodeIds: Seq[Long]
 ) {
   def fromNodeId: Long = nodeIds.head
 

diff --git a/...rc/main/scala/kpn/server/analyzer/engine/analysis/route/structure/RoutePathAnalyzer.scala b/...rc/main/scala/kpn/server/analyzer/engine/analysis/route/structure/RoutePathAnalyzer.scala
diff --git a/...main/scala/kpn/server/analyzer/engine/analysis/route/structure/RouteSegmentAnalyzer.scala b/...main/scala/kpn/server/analyzer/engine/analysis/route/structure/RouteSegmentAnalyzer.scala
@@ -231,8 +231,7 @@ class RouteSegmentAnalyzer(context: RouteDetailAnalysisContext) {
       routeLinkWay.way.id,
       routeLinkWay.link,
       routeLinkWay.role,
-      nodeIds,
-      Seq.empty // filled in later during path analysis
+      nodeIds
     )
 
     val fromNetworkNode = context.routeNodeAnalysis.nodes.find(_.node.id == fragment.fromNodeId)
@@ -255,8 +254,7 @@ class RouteSegmentAnalyzer(context: RouteDetailAnalysisContext) {
       routeLinkWay.way.id,
       routeLinkWay.link,
       routeLinkWay.role,
-      nodeIds,
-      Seq.empty // filled in later during path analysis
+      nodeIds
     )
   }