#368 move monitor structure analysis to route analysis

vmarc · Jun 21, 2024 · a2306f5 · a2306f5
1 parent 96d3b80
commit a2306f5
Show file tree

Hide file tree

Showing 81 changed files with 100 additions and 101 deletions.
diff --git a/...itor/structure/StructurePathElement.scala → ...oute/structure/StructurePathElement.scala b/...itor/structure/StructurePathElement.scala → ...oute/structure/StructurePathElement.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 case class StructurePathElement(
   element: StructureElement,
@@ -31,4 +31,4 @@ case class StructurePathElement(
       element.nodeIds.last
     }
   }
-}
+}
diff --git a/.../monitor/structure/reference/Element.java → ...is/route/structure/reference/Element.java b/.../monitor/structure/reference/Element.java → ...is/route/structure/reference/Element.java
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure.reference;
+package kpn.server.analyzer.engine.analysis.route.structure.reference;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...e/monitor/structure/reference/Member.java → ...sis/route/structure/reference/Member.java b/...e/monitor/structure/reference/Member.java → ...sis/route/structure/reference/Member.java
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure.reference;
+package kpn.server.analyzer.engine.analysis.route.structure.reference;
 
 import java.util.Objects;
 

diff --git a/...ine/monitor/structure/reference/Node.java → ...lysis/route/structure/reference/Node.java b/...ine/monitor/structure/reference/Node.java → ...lysis/route/structure/reference/Node.java
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure.reference;
+package kpn.server.analyzer.engine.analysis.route.structure.reference;
 
 import java.util.HashMap;
 

diff --git a/...monitor/structure/reference/Relation.java → ...s/route/structure/reference/Relation.java b/...monitor/structure/reference/Relation.java → ...s/route/structure/reference/Relation.java
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure.reference;
+package kpn.server.analyzer.engine.analysis.route.structure.reference;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/...ne/monitor/structure/reference/Utils.java → ...ysis/route/structure/reference/Utils.java b/...ne/monitor/structure/reference/Utils.java → ...ysis/route/structure/reference/Utils.java
@@ -1,9 +1,9 @@
-package kpn.server.analyzer.engine.monitor.structure.reference;
+package kpn.server.analyzer.engine.analysis.route.structure.reference;
 
-import kpn.server.analyzer.engine.monitor.structure.reference.WayInfo.Direction;
+import kpn.server.analyzer.engine.analysis.route.structure.reference.WayInfo.Direction;
 
-import static kpn.server.analyzer.engine.monitor.structure.reference.WayInfo.Direction.NONE;
-import static kpn.server.analyzer.engine.monitor.structure.reference.WayInfo.Direction.ROUNDABOUT_RIGHT;
+import static kpn.server.analyzer.engine.analysis.route.structure.reference.WayInfo.Direction.NONE;
+import static kpn.server.analyzer.engine.analysis.route.structure.reference.WayInfo.Direction.ROUNDABOUT_RIGHT;
 
 public class Utils {
 

diff --git a/...gine/monitor/structure/reference/Way.java → ...alysis/route/structure/reference/Way.java b/...gine/monitor/structure/reference/Way.java → ...alysis/route/structure/reference/Way.java
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure.reference;
+package kpn.server.analyzer.engine.analysis.route.structure.reference;
 
 import java.util.List;
 import java.util.Map;
@@ -67,4 +67,4 @@ public String toString() {
         String nodeIds = nodes.stream().map(node -> node.getId().toString()).collect(Collectors.joining(", ", "(", ")"));
         return String.format("Way(id=%d, nodeIds=%s)", id, nodeIds);
     }
-}
+}
diff --git a/.../monitor/structure/reference/WayInfo.java → ...is/route/structure/reference/WayInfo.java b/.../monitor/structure/reference/WayInfo.java → ...is/route/structure/reference/WayInfo.java
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure.reference;
+package kpn.server.analyzer.engine.analysis.route.structure.reference;
 
 public class WayInfo {
 

diff --git a/.../structure/reference/WayInfoAnalyzer.java → .../structure/reference/WayInfoAnalyzer.java b/.../structure/reference/WayInfoAnalyzer.java → .../structure/reference/WayInfoAnalyzer.java
@@ -1,13 +1,13 @@
-package kpn.server.analyzer.engine.monitor.structure.reference;
+package kpn.server.analyzer.engine.analysis.route.structure.reference;
 
-import kpn.server.analyzer.engine.monitor.structure.reference.WayInfo.Direction;
+import kpn.server.analyzer.engine.analysis.route.structure.reference.WayInfo.Direction;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import static java.util.stream.Collectors.joining;
-import static kpn.server.analyzer.engine.monitor.structure.reference.WayInfo.Direction.*;
+import static kpn.server.analyzer.engine.analysis.route.structure.reference.WayInfo.Direction.*;
 
 public class WayInfoAnalyzer {
 

diff --git a/...src/main/java/kpn/server/analyzer/engine/monitor/MonitorRouteOsmSegmentAnalyzerImpl.scala b/...src/main/java/kpn/server/analyzer/engine/monitor/MonitorRouteOsmSegmentAnalyzerImpl.scala
@@ -6,8 +6,8 @@ import kpn.core.util.Haversine
 import kpn.core.util.Log
 import kpn.server.analyzer.engine.monitor.domain.MonitorRouteOsmSegmentAnalysis
 import kpn.server.analyzer.engine.monitor.domain.MonitorRouteSegmentData
-import kpn.server.analyzer.engine.monitor.structure.ElementDirection
-import kpn.server.analyzer.engine.monitor.structure.StructureElementAnalyzer
+import kpn.server.analyzer.engine.analysis.route.structure.ElementDirection
+import kpn.server.analyzer.engine.analysis.route.structure.StructureElementAnalyzer
 import org.locationtech.jts.geom.Coordinate
 import org.locationtech.jts.geom.GeometryFactory
 import org.springframework.stereotype.Component

diff --git a/server/src/main/scala/kpn/core/tools/monitor/support/StructureAnalysisTool.scala b/server/src/main/scala/kpn/core/tools/monitor/support/StructureAnalysisTool.scala
@@ -5,7 +5,7 @@ import kpn.core.loadOld.Parser
 import kpn.core.overpass.OverpassQueryExecutorRemoteImpl
 import kpn.core.overpass.QueryRelation
 import kpn.core.tools.config.Dirs
-import kpn.server.analyzer.engine.monitor.structure.StructureElementAnalyzer
+import kpn.server.analyzer.engine.analysis.route.structure.StructureElementAnalyzer
 import org.apache.commons.io.FileUtils
 
 import java.io.File

diff --git a/server/src/main/scala/kpn/server/analyzer/engine/analysis/route/RouteSegmentAnalysis.scala b/server/src/main/scala/kpn/server/analyzer/engine/analysis/route/RouteSegmentAnalysis.scala
@@ -1,6 +1,6 @@
 package kpn.server.analyzer.engine.analysis.route
 
-import kpn.server.analyzer.engine.monitor.structure.Structure
+import kpn.server.analyzer.engine.analysis.route.structure.Structure
 
 case class RouteSegmentAnalysis(
   osmDistance: Long,

diff --git a/...main/scala/kpn/server/analyzer/engine/analysis/route/analyzers/RouteSegmentAnalyzer.scala b/...main/scala/kpn/server/analyzer/engine/analysis/route/analyzers/RouteSegmentAnalyzer.scala
@@ -8,9 +8,9 @@ import kpn.server.analyzer.engine.analysis.route.RouteSegmentAnalysis
 import kpn.server.analyzer.engine.analysis.route.RouteSegmentData
 import kpn.server.analyzer.engine.analysis.route.domain.RouteAnalysisContext
 import kpn.server.analyzer.engine.monitor.MonitorRouteAnalysisSupport
-import kpn.server.analyzer.engine.monitor.structure.ElementDirection
-import kpn.server.analyzer.engine.monitor.structure.StructureAnalyzer
-import kpn.server.analyzer.engine.monitor.structure.StructureElementAnalyzer
+import kpn.server.analyzer.engine.analysis.route.structure.ElementDirection
+import kpn.server.analyzer.engine.analysis.route.structure.StructureAnalyzer
+import kpn.server.analyzer.engine.analysis.route.structure.StructureElementAnalyzer
 import org.locationtech.jts.geom.Coordinate
 import org.locationtech.jts.geom.GeometryFactory
 

diff --git a/.../engine/monitor/structure/Direction.scala → .../analysis/route/structure/Direction.scala b/.../engine/monitor/structure/Direction.scala → .../analysis/route/structure/Direction.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 object Direction extends Enumeration {
   val Forward, Backward, RoundaboutLeft, RoundaboutRight = Value

diff --git a/.../monitor/structure/ElementDirection.scala → ...is/route/structure/ElementDirection.scala b/.../monitor/structure/ElementDirection.scala → ...is/route/structure/ElementDirection.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 object ElementDirection extends Enumeration {
   val Forward, Backward = Value

diff --git a/.../engine/monitor/structure/Structure.scala → .../analysis/route/structure/Structure.scala b/.../engine/monitor/structure/Structure.scala → .../analysis/route/structure/Structure.scala
@@ -1,7 +1,7 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 case class Structure(
   forwardPath: Option[StructurePath],
   backwardPath: Option[StructurePath],
   otherPaths: Seq[StructurePath]
-)
+)
diff --git a/...monitor/structure/StructureAnalyzer.scala → ...s/route/structure/StructureAnalyzer.scala b/...monitor/structure/StructureAnalyzer.scala → ...s/route/structure/StructureAnalyzer.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.api.custom.Relation
 

diff --git a/.../monitor/structure/StructureElement.scala → ...is/route/structure/StructureElement.scala b/.../monitor/structure/StructureElement.scala → ...is/route/structure/StructureElement.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 object StructureElement {
   def from(fragments: Seq[StructureFragment], direction: Option[ElementDirection.Value]): StructureElement = {

diff --git a/.../structure/StructureElementAnalyzer.scala → .../structure/StructureElementAnalyzer.scala b/.../structure/StructureElementAnalyzer.scala → .../structure/StructureElementAnalyzer.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.api.common.data.Member
 import kpn.api.common.data.WayMember

diff --git a/...tor/structure/StructureElementGroup.scala → ...ute/structure/StructureElementGroup.scala b/...tor/structure/StructureElementGroup.scala → ...ute/structure/StructureElementGroup.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 case class StructureElementGroup(
   elements: Seq[StructureElement]

diff --git a/...monitor/structure/StructureFragment.scala → ...s/route/structure/StructureFragment.scala b/...monitor/structure/StructureFragment.scala → ...s/route/structure/StructureFragment.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.api.common.data.Way
 

diff --git a/...r/structure/StructureMemberAnalyzer.scala → ...e/structure/StructureMemberAnalyzer.scala b/...r/structure/StructureMemberAnalyzer.scala → ...e/structure/StructureMemberAnalyzer.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.api.common.data.Member
 import kpn.api.custom.Relation

diff --git a/...itor/structure/StructureMemberGroup.scala → ...oute/structure/StructureMemberGroup.scala b/...itor/structure/StructureMemberGroup.scala → ...oute/structure/StructureMemberGroup.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.api.common.data.Member
 

diff --git a/...ine/monitor/structure/StructurePath.scala → ...lysis/route/structure/StructurePath.scala b/...ine/monitor/structure/StructurePath.scala → ...lysis/route/structure/StructurePath.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 case class StructurePath(
   startNodeId: Long,
@@ -11,4 +11,4 @@ case class StructurePath(
       case None => Seq.empty
     }
   }
-}
+}
diff --git a/...ine/monitor/structure/StructureUtil.scala → ...lysis/route/structure/StructureUtil.scala b/...ine/monitor/structure/StructureUtil.scala → ...lysis/route/structure/StructureUtil.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 object StructureUtil {
 

diff --git a/...ine/monitor/structure/WayMemberLink.scala → ...lysis/route/structure/WayMemberLink.scala b/...ine/monitor/structure/WayMemberLink.scala → ...lysis/route/structure/WayMemberLink.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.api.common.data.WayMember
 

diff --git a/...tructure/ReferenceStructureAnalyzer.scala → ...tructure/ReferenceStructureAnalyzer.scala b/...tructure/ReferenceStructureAnalyzer.scala → ...tructure/ReferenceStructureAnalyzer.scala
@@ -1,10 +1,10 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.api.common.data.Member
 import kpn.api.common.data.WayMember
 import kpn.api.custom.Relation
-import kpn.server.analyzer.engine.monitor.structure.reference.WayInfo
-import kpn.server.analyzer.engine.monitor.structure.reference.WayInfoAnalyzer
+import kpn.server.analyzer.engine.analysis.route.structure.reference.WayInfo
+import kpn.server.analyzer.engine.analysis.route.structure.reference.WayInfoAnalyzer
 
 import java.util.Collections
 import java.util.stream.Collectors.toUnmodifiableList
@@ -20,23 +20,23 @@ class ReferenceStructureAnalyzer(traceEnabled: Boolean = false) {
     analyzer.analyze().asScala.toSeq.zipWithIndex.map { case (wayInfo, index) => s"${index + 1} ${wayInfoString(wayInfo)}" }
   }
 
-  private def buildReferenceRelation(relation: Relation): kpn.server.analyzer.engine.monitor.structure.reference.Relation = {
-    val nodeMap = mutable.Map[Long, kpn.server.analyzer.engine.monitor.structure.reference.Node]()
+  private def buildReferenceRelation(relation: Relation): kpn.server.analyzer.engine.analysis.route.structure.reference.Relation = {
+    val nodeMap = mutable.Map[Long, kpn.server.analyzer.engine.analysis.route.structure.reference.Node]()
     val referenceRelationMembers = relation.members.map {
       case wayMember: WayMember =>
         val referenceRole = buildReferenceRole(wayMember)
         val referenceNodes = buildReferenceNodes(nodeMap, wayMember)
         val referenceTags = buildReferenceTags(wayMember)
-        val referenceWay = new kpn.server.analyzer.engine.monitor.structure.reference.Way(
+        val referenceWay = new kpn.server.analyzer.engine.analysis.route.structure.reference.Way(
           wayMember.way.id,
           referenceTags,
           referenceNodes
         )
-        new kpn.server.analyzer.engine.monitor.structure.reference.Member(referenceRole, referenceWay)
+        new kpn.server.analyzer.engine.analysis.route.structure.reference.Member(referenceRole, referenceWay)
 
       case _ => throw new IllegalStateException("non way member types not implemented yet")
     }.asJavaCollection.stream.collect(toUnmodifiableList())
-    new kpn.server.analyzer.engine.monitor.structure.reference.Relation(referenceRelationMembers)
+    new kpn.server.analyzer.engine.analysis.route.structure.reference.Relation(referenceRelationMembers)
   }
 
   private def buildReferenceRole(member: Member): String = {
@@ -46,9 +46,9 @@ class ReferenceStructureAnalyzer(traceEnabled: Boolean = false) {
     }
   }
 
-  private def buildReferenceNodes(nodeMap: mutable.Map[Long, kpn.server.analyzer.engine.monitor.structure.reference.Node], wayMember: WayMember): java.util.List[kpn.server.analyzer.engine.monitor.structure.reference.Node] = {
+  private def buildReferenceNodes(nodeMap: mutable.Map[Long, kpn.server.analyzer.engine.analysis.route.structure.reference.Node], wayMember: WayMember): java.util.List[kpn.server.analyzer.engine.analysis.route.structure.reference.Node] = {
     wayMember.way.nodes.map { node =>
-      nodeMap.getOrElseUpdate(node.id, new kpn.server.analyzer.engine.monitor.structure.reference.Node(node.id))
+      nodeMap.getOrElseUpdate(node.id, new kpn.server.analyzer.engine.analysis.route.structure.reference.Node(node.id))
     }.asJavaCollection.stream.collect(toUnmodifiableList())
   }
 

diff --git a/...r/structure/StructureAnalysisResult.scala → ...e/structure/StructureAnalysisResult.scala b/...r/structure/StructureAnalysisResult.scala → ...e/structure/StructureAnalysisResult.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 case class StructureAnalysisResult(
   reference: Seq[String],

diff --git a/...tor/structure/StructureAnalyzerTest.scala → ...ute/structure/StructureAnalyzerTest.scala b/...tor/structure/StructureAnalyzerTest.scala → ...ute/structure/StructureAnalyzerTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 import kpn.server.analyzer.engine.analysis.caseStudies.CaseStudy
@@ -23,13 +23,13 @@ class StructureAnalyzerTest extends UnitTest {
   test("case study 3") {
     val relation = CaseStudy.load("/case-studies/monitor/16786092.xml")
     val elementGroups = StructureElementAnalyzer.analyze(relation.members)
-    elementGroups.size should equal(1)
+    elementGroups.size should equal(4)
   }
 
   test("case study 4") {
     val relation = CaseStudy.load("/case-studies/monitor/16827727.xml")
     val elementGroups = StructureElementAnalyzer.analyze(relation.members)
-    elementGroups.size should equal(1)
+    elementGroups.size should equal(8)
   }
 
   test("case study 5") {

diff --git a/...itor/structure/StructureElementTest.scala → ...oute/structure/StructureElementTest.scala b/...itor/structure/StructureElementTest.scala → ...oute/structure/StructureElementTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/...monitor/structure/StructurePathTest.scala → ...s/route/structure/StructurePathTest.scala b/...monitor/structure/StructurePathTest.scala → ...s/route/structure/StructurePathTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/...onitor/structure/StructureTestSetup.scala → .../route/structure/StructureTestSetup.scala b/...onitor/structure/StructureTestSetup.scala → .../route/structure/StructureTestSetup.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.api.custom.Relation
 import kpn.core.data.Data

diff --git a/...structure/StructureTestSetupBuilder.scala → ...structure/StructureTestSetupBuilder.scala b/...structure/StructureTestSetupBuilder.scala → ...structure/StructureTestSetupBuilder.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.api.common.SharedTestObjects
 import kpn.api.common.data.raw.RawData

diff --git a/...monitor/structure/StructureUtilTest.scala → ...s/route/structure/StructureUtilTest.scala b/...monitor/structure/StructureUtilTest.scala → ...s/route/structure/StructureUtilTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/...cture_01_SingleWayBidirectionalTest.scala → ...cture_01_SingleWayBidirectionalTest.scala b/...cture_01_SingleWayBidirectionalTest.scala → ...cture_01_SingleWayBidirectionalTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/...e/Structure_02_SingleWayForwardTest.scala → ...e/Structure_02_SingleWayForwardTest.scala b/...e/Structure_02_SingleWayForwardTest.scala → ...e/Structure_02_SingleWayForwardTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/.../Structure_03_SingleWayBackwardTest.scala → .../Structure_03_SingleWayBackwardTest.scala b/.../Structure_03_SingleWayBackwardTest.scala → .../Structure_03_SingleWayBackwardTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/...ture_04_SingleWayRoundaboutLoopTest.scala → ...ture_04_SingleWayRoundaboutLoopTest.scala b/...ture_04_SingleWayRoundaboutLoopTest.scala → ...ture_04_SingleWayRoundaboutLoopTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/..._05_SingleWayRoundaboutNotALoopTest.scala → ..._05_SingleWayRoundaboutNotALoopTest.scala b/..._05_SingleWayRoundaboutNotALoopTest.scala → ..._05_SingleWayRoundaboutNotALoopTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/...e/Structure_11_DerivedDirectionTest.scala → ...e/Structure_11_DerivedDirectionTest.scala b/...e/Structure_11_DerivedDirectionTest.scala → ...e/Structure_11_DerivedDirectionTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/...ture_12_DerivedDirectionReverseTest.scala → ...ture_12_DerivedDirectionReverseTest.scala b/...ture_12_DerivedDirectionReverseTest.scala → ...ture_12_DerivedDirectionReverseTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/...ture_13_DerivedDirectionForwardTest.scala → ...ture_13_DerivedDirectionForwardTest.scala b/...ture_13_DerivedDirectionForwardTest.scala → ...ture_13_DerivedDirectionForwardTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/...ure_14_DerivedDirectionBackwardTest.scala → ...ure_14_DerivedDirectionBackwardTest.scala b/...ure_14_DerivedDirectionBackwardTest.scala → ...ure_14_DerivedDirectionBackwardTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/...erivedDirectionBackwardBackwardTest.scala → ...erivedDirectionBackwardBackwardTest.scala b/...erivedDirectionBackwardBackwardTest.scala → ...erivedDirectionBackwardBackwardTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest
 

diff --git a/...ructure/Structure_21_ContinuousTest.scala → ...ructure/Structure_21_ContinuousTest.scala b/...ructure/Structure_21_ContinuousTest.scala → ...ructure/Structure_21_ContinuousTest.scala
@@ -1,4 +1,4 @@
-package kpn.server.analyzer.engine.monitor.structure
+package kpn.server.analyzer.engine.analysis.route.structure
 
 import kpn.core.util.UnitTest