#278 monitor route analysis - wip

vmarc · Jan 12, 2024 · fb3c7de · fb3c7de
1 parent 0800146
commit fb3c7de
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 29 deletions.
diff --git a/server/src/main/scala/kpn/server/analyzer/engine/monitor/ElementDirection.scala b/server/src/main/scala/kpn/server/analyzer/engine/monitor/ElementDirection.scala
@@ -0,0 +1,5 @@
+package kpn.server.analyzer.engine.monitor
+
+object ElementDirection extends Enumeration {
+  val Up, Down = Value
+}
diff --git a/server/src/main/scala/kpn/server/analyzer/engine/monitor/MonitorRouteElement.scala b/server/src/main/scala/kpn/server/analyzer/engine/monitor/MonitorRouteElement.scala
@@ -1,12 +1,16 @@
 package kpn.server.analyzer.engine.monitor
 
 object MonitorRouteElement {
-  def from(fragments: Seq[MonitorRouteFragment], direction: Option[String]): MonitorRouteElement = {
+  def from(fragments: Seq[MonitorRouteFragment], direction: Option[ElementDirection.Value]): MonitorRouteElement = {
     MonitorRouteElement(0, fragments, direction)
   }
 }
 
-case class MonitorRouteElement(id: Long, fragments: Seq[MonitorRouteFragment], direction: Option[String]) {
+case class MonitorRouteElement(
+  id: Long,
+  fragments: Seq[MonitorRouteFragment],
+  direction: Option[ElementDirection.Value]
+) {
 
   def startNodeId: Long = {
     fragments.head.startNode.id
@@ -19,7 +23,7 @@ case class MonitorRouteElement(id: Long, fragments: Seq[MonitorRouteFragment], d
   def isLoop: Boolean = {
     startNodeId == endNodeId
   }
-  
+
   def string: String = {
     val endNodeIds = fragments.map(_.endNode.id)
     val nodeString = startNodeId.toString + endNodeIds.mkString(">", ">", "")

diff --git a/server/src/main/scala/kpn/server/analyzer/engine/monitor/MonitorRouteElementAnalyzer.scala b/server/src/main/scala/kpn/server/analyzer/engine/monitor/MonitorRouteElementAnalyzer.scala
@@ -23,7 +23,7 @@ object MonitorRouteElementAnalyzer {
 
 class MonitorRouteElementAnalyzer(wayMembers: Seq[WayMember]) {
 
-  private var oneWayDirection: Option[String] = None // "up" or "down"
+  private var elementDirection: Option[ElementDirection.Value] = None
 
   private val elementGroups = mutable.Buffer[MonitorRouteElementGroup]()
   private val elements = mutable.Buffer[MonitorRouteElement]()
@@ -46,19 +46,19 @@ class MonitorRouteElementAnalyzer(wayMembers: Seq[WayMember]) {
   private def processWayMember(): Unit = {
     debug(s"way ${contextCurrentWayMember.way.id} role=${contextCurrentWayMember.role}")
     if (contextCurrentWayMember.isUnidirectional) {
-      if (oneWayDirection.isEmpty) {
+      if (elementDirection.isEmpty) {
         processFirstUnidirectionalWay()
       }
       else {
         processNextUnidirectionalWay()
       }
     }
     else {
-      if (oneWayDirection.nonEmpty) {
+      if (elementDirection.nonEmpty) {
         debug(s"  first way after unidirectional element")
 
-        oneWayDirection match {
-          case Some("up") => reverseFragments()
+        elementDirection match {
+          case Some(ElementDirection.Up) => reverseFragments()
           case _ =>
         }
 
@@ -86,12 +86,12 @@ class MonitorRouteElementAnalyzer(wayMembers: Seq[WayMember]) {
                   val fragments1 = element.fragments.takeWhile(fragment => fragment.startNode.id != splitNodeId)
                   val fragments2 = element.fragments.drop(fragments1.length)
 
-                  val oppositeDirection = oneWayDirection match {
-                    case Some("down") => Some("up")
-                    case Some("up") => Some("down")
+                  val oppositeDirection = elementDirection match {
+                    case Some(ElementDirection.Down) => Some(ElementDirection.Up)
+                    case Some(ElementDirection.Up) => Some(ElementDirection.Down)
                     case _ => None
                   }
-                  val element1 = MonitorRouteElement.from(fragments1, oneWayDirection)
+                  val element1 = MonitorRouteElement.from(fragments1, elementDirection)
                   val element2 = MonitorRouteElement.from(fragments2, oppositeDirection)
 
                   debug(s"    split element1: direction=${element1.direction}, fragments: ${element1.fragments.map(_.string).mkString(", ")}")
@@ -105,7 +105,7 @@ class MonitorRouteElementAnalyzer(wayMembers: Seq[WayMember]) {
             }
         }
 
-        oneWayDirection = None
+        elementDirection = None
         addBidirectionalFragmentByLookingAheadAtNextWayMember()
       }
       else {
@@ -203,21 +203,21 @@ class MonitorRouteElementAnalyzer(wayMembers: Seq[WayMember]) {
       case None =>
         // the first way in the route has a role
         if (contextCurrentWayMember.hasRoleForward) {
-          oneWayDirection = Some("down")
+          elementDirection = Some(ElementDirection.Down)
         } else {
-          oneWayDirection = Some("up")
+          elementDirection = Some(ElementDirection.Up)
         }
 
       case Some(previousElement) =>
         if (previousElement.endNodeId == contextCurrentWayMember.startNode.id) {
-          oneWayDirection = Some("down")
+          elementDirection = Some(ElementDirection.Down)
         }
         else if (previousElement.endNodeId == contextCurrentWayMember.startNode.id) {
-          oneWayDirection = Some("up")
+          elementDirection = Some(ElementDirection.Up)
         }
         else {
           finalizeCurrentGroup()
-          oneWayDirection = Some("down")
+          elementDirection = Some(ElementDirection.Down)
         }
     }
 
@@ -230,7 +230,7 @@ class MonitorRouteElementAnalyzer(wayMembers: Seq[WayMember]) {
   }
 
   private def processNextUnidirectionalWay(): Unit = {
-    if (oneWayDirection.contains("down")) {
+    if (elementDirection.contains(ElementDirection.Down)) {
       findPreviousFragment() match {
         case None =>
           throw new Exception("illegal state??")
@@ -246,7 +246,7 @@ class MonitorRouteElementAnalyzer(wayMembers: Seq[WayMember]) {
                 if (contextCurrentWayMember.endNode.id == firstFragmentInElement.startNode.id) {
                   // switch
                   finalizeCurrentElement()
-                  oneWayDirection = Some("up")
+                  elementDirection = Some(ElementDirection.Up)
                   addFragment(contextCurrentWayMember)
                 }
                 else {
@@ -273,7 +273,7 @@ class MonitorRouteElementAnalyzer(wayMembers: Seq[WayMember]) {
                 if (contextCurrentWayMember.endNode.id == firstFragmentInElement.startNode.id) {
                   // switch
                   finalizeCurrentElement()
-                  oneWayDirection = Some("down")
+                  elementDirection = Some(ElementDirection.Down)
                   addFragment(contextCurrentWayMember)
                 }
                 else {
@@ -307,8 +307,8 @@ class MonitorRouteElementAnalyzer(wayMembers: Seq[WayMember]) {
   }
 
   private def addElement(fragments: Seq[MonitorRouteFragment]): MonitorRouteElement = {
-    debug(s"  add element: direction=$oneWayDirection, fragments: ${fragments.map(_.string).mkString(", ")}")
-    val element = MonitorRouteElement.from(fragments, oneWayDirection)
+    debug(s"  add element: direction=$elementDirection, fragments: ${fragments.map(_.string).mkString(", ")}")
+    val element = MonitorRouteElement.from(fragments, elementDirection)
     elements.addOne(element)
     element
   }

diff --git a/...r/src/test/scala/kpn/server/analyzer/engine/monitor/MonitorRouteElementAnalyzerTest.scala b/...r/src/test/scala/kpn/server/analyzer/engine/monitor/MonitorRouteElementAnalyzerTest.scala
@@ -85,7 +85,7 @@ class MonitorRouteElementAnalyzerTest extends UnitTest {
     ).shouldMatchTo(
       Seq(
         Seq(
-          "1>2 (down)",
+          "1>2 (Down)",
           "2>3"
         )
       )
@@ -101,7 +101,7 @@ class MonitorRouteElementAnalyzerTest extends UnitTest {
     ).shouldMatchTo(
       Seq(
         Seq(
-          "2>1 (down)",
+          "2>1 (Down)",
         ),
         Seq(
           "3>2"
@@ -124,8 +124,8 @@ class MonitorRouteElementAnalyzerTest extends UnitTest {
       Seq(
         Seq(
           "1>2",
-          "2>3>8 (down)",
-          "8>7>2 (up)",
+          "2>3>8 (Down)",
+          "8>7>2 (Up)",
           "8>9",
         )
       )
@@ -148,8 +148,8 @@ class MonitorRouteElementAnalyzerTest extends UnitTest {
       Seq(
         Seq(
           "1>2",
-          "2>3>8 (down)",
-          "8>7>2 (up)",
+          "2>3>8 (Down)",
+          "8>7>2 (Up)",
           "8>9",
         ),
         Seq(