Fixed #13503

eclipse-sumo · Nov 13, 2023 · 36c0f88 · 36c0f88
1 parent 2919ee3
commit 36c0f88
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 18 deletions.
diff --git a/src/netedit/elements/demand/GNEDemandElement.h b/src/netedit/elements/demand/GNEDemandElement.h
@@ -58,13 +58,14 @@ class GNEDemandElement : public GNEPathManager::PathElement, public GNEHierarchi
 
     /// @brief enum class for demandElement problems
     enum class Problem {
-        OK,                     // There is no problem
-        INVALID_ELEMENT,        // Element is invalid (for example, a route without edges)
-        INVALID_PATH,           // Path (route, trip... ) is not valid (i.e is empty)
-        DISCONNECTED_PLAN,      // Plan element (person, containers) is not connected with the previous or next plan
-        INVALID_STOPPOSITION,   // StopPosition is invalid (only used in stops over edges or lanes
-        STOP_DOWNSTREAM,        // Stops don't follow their route parent
-        NO_PLANS                // Person or container doesn't have a plan
+        OK,                         // There is no problem
+        INVALID_ELEMENT,            // Element is invalid (for example, a route without edges)
+        INVALID_PATH,               // Path (route, trip... ) is not valid (i.e is empty)
+        DISCONNECTED_PLAN,          // Plan element (person, containers) is not connected with the previous or next plan
+        INVALID_STOPPOSITION,       // StopPosition is invalid (only used in stops over edges or lanes
+        STOP_DOWNSTREAM,            // Stops don't follow their route parent
+        REPEATEDROUTE_DISCONNECTED, // Repeated route is disconnected
+        NO_PLANS                    // Person or container doesn't have a plan
     };
 
     /**@brief Constructor

diff --git a/src/netedit/elements/demand/GNERoute.cpp b/src/netedit/elements/demand/GNERoute.cpp
@@ -236,23 +236,29 @@ GNERoute::isDemandElementValid() const {
             stops.push_back(routeChild);
         }
     }
+    // check stops
     if (getInvalidStops().size() > 0) {
         return Problem::STOP_DOWNSTREAM;
     }
-    // check parent edges
-    if ((getParentEdges().size() == 2) && (getParentEdges().at(0) == getParentEdges().at(1))) {
-        // from and to are the same edges, then return true
-        return Problem::OK;
-    } else if (getParentEdges().size() > 0) {
-        // check that exist a connection between every edge
-        if (isRouteValid(getParentEdges()).size() > 0) {
-            return Problem::INVALID_PATH;
-        } else {
-            return Problem::OK;
+    // check repeating
+    if (myRepeat > 0) {
+        // avoid repeat in routes with only one edge
+        if (getParentEdges().size() == 1) {
+            return Problem::REPEATEDROUTE_DISCONNECTED;
         }
+        // check if front and last routes is connected
+        if ((getParentEdges().front() != getParentEdges().back()) &&
+            (isRouteValid({getParentEdges().back(), getParentEdges().front()}).size() > 0)) {
+            return Problem::REPEATEDROUTE_DISCONNECTED;
+        }
+    }
+    // check that exist a connection between every edge
+    if (isRouteValid(getParentEdges()).size() > 0) {
+        return Problem::INVALID_PATH;
     } else {
-        return Problem::INVALID_ELEMENT;
+        return Problem::OK;
     }
+    return Problem::INVALID_ELEMENT;
 }
 
 
@@ -269,6 +275,18 @@ GNERoute::getDemandElementProblem() const {
     if (invalidStops.size() > 0) {
         return toString(invalidStops.size()) + " stops are outside of route (downstream)";
     }
+    // check repeating
+    if (myRepeat > 0) {
+        // avoid repeat in routes with only one edge
+        if (getParentEdges().size() == 1) {
+            return TL("Cannot repeat in routes with only one edge");
+        }
+        // check if front and last routes is connected
+        if ((getParentEdges().front() != getParentEdges().back()) &&
+            (isRouteValid({getParentEdges().back(), getParentEdges().front()}).size() > 0)) {
+            return TL("Cannot repeat route; front and last edge isn't connected");
+        }
+    }
     // return string with the problem obtained from isRouteValid
     return isRouteValid(getParentEdges());
 }