fix #5121

eclipse-sumo · Jan 30, 2019 · f52facb · f52facb
1 parent 0e14c91
commit f52facb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/src/netbuild/NBEdge.cpp b/src/netbuild/NBEdge.cpp
@@ -2608,7 +2608,7 @@ NBEdge::prepareEdgePriorities(const EdgeVector* outgoing) {
 
 
 void
-NBEdge::appendTurnaround(bool noTLSControlled, bool onlyDeadends, bool checkPermissions) {
+NBEdge::appendTurnaround(bool noTLSControlled, bool onlyDeadends, bool noGeometryLike, bool checkPermissions) {
     // do nothing if no turnaround is known
     if (myTurnDestination == nullptr || myTo->getType() == NODETYPE_RAIL_CROSSING) {
         return;
@@ -2647,6 +2647,9 @@ NBEdge::appendTurnaround(bool noTLSControlled, bool onlyDeadends, bool checkPerm
             return;
         }
     };
+    if (noGeometryLike && myTo->geometryLike() && myTo->getOutgoingEdges().size() > 1) {
+        return;
+    }
     setConnection(fromLane, myTurnDestination, toLane, L2L_VALIDATED);
 }
 

diff --git a/src/netbuild/NBEdge.h b/src/netbuild/NBEdge.h
@@ -1052,7 +1052,7 @@ class NBEdge : public Named, public Parameterised {
      *  of this edge to the leftmost lane of myTurnDestination).
      * @param[in] noTLSControlled Whether the turnaround shall not be connected if this edge is controlled by a tls
      */
-    void appendTurnaround(bool noTLSControlled, bool onlyDeadends, bool checkPermissions);
+    void appendTurnaround(bool noTLSControlled, bool onlyDeadends, bool noGeometryLike, bool checkPermissions);
 
     /** @brief Returns the node at the given edges length (using an epsilon)
         @note When no node is existing at the given position, 0 is returned

diff --git a/src/netbuild/NBEdgeCont.cpp b/src/netbuild/NBEdgeCont.cpp
@@ -818,17 +818,17 @@ NBEdgeCont::recheckLanes() {
 
 
 void
-NBEdgeCont::appendTurnarounds(bool noTLSControlled, bool onlyDeadends) {
+NBEdgeCont::appendTurnarounds(bool noTLSControlled, bool onlyDeadends, bool noGeometryLike) {
     for (EdgeCont::iterator i = myEdges.begin(); i != myEdges.end(); i++) {
-        (*i).second->appendTurnaround(noTLSControlled, onlyDeadends, true);
+        (*i).second->appendTurnaround(noTLSControlled, onlyDeadends, noGeometryLike, true);
     }
 }
 
 
 void
 NBEdgeCont::appendTurnarounds(const std::set<std::string>& ids, bool noTLSControlled) {
     for (std::set<std::string>::const_iterator it = ids.begin(); it != ids.end(); it++) {
-        myEdges[*it]->appendTurnaround(noTLSControlled, false, false);
+        myEdges[*it]->appendTurnaround(noTLSControlled, false, false, false);
     }
 }
 

diff --git a/src/netbuild/NBEdgeCont.h b/src/netbuild/NBEdgeCont.h
@@ -417,7 +417,7 @@ class NBEdgeCont {
      * @todo Recheck whether a visitor-pattern should be used herefor
      * @see NBEdge::appendTurnaround
      */
-    void appendTurnarounds(bool noTLSControlled, bool onlyDeadends);
+    void appendTurnarounds(bool noTLSControlled, bool onlyDeadends, bool noGeometryLike);
 
 
     /** @brief Appends turnarounds to all edges stored in the container

diff --git a/src/netbuild/NBFrame.cpp b/src/netbuild/NBFrame.cpp
@@ -106,6 +106,9 @@ NBFrame::fillOptions(bool forNetgen) {
     oc.addSynonyme("no-turnarounds.tls", "no-tls-turnarounds", true);
     oc.addDescription("no-turnarounds.tls", "Junctions", "Disables building turnarounds at tls-controlled junctions");
 
+    oc.doRegister("no-turnarounds.geometry", new Option_Bool(true));
+    oc.addDescription("no-turnarounds.geometry", "Junctions", "Disables building turnarounds at geometry-like junctions");
+
     oc.doRegister("no-turnarounds.except-deadend", new Option_Bool(false));
     oc.addDescription("no-turnarounds.except-deadend", "Junctions", "Disables building turnarounds except at dead end junctions");
 

diff --git a/src/netbuild/NBNetBuilder.cpp b/src/netbuild/NBNetBuilder.cpp
@@ -435,7 +435,7 @@ NBNetBuilder::compute(OptionsCont& oc, const std::set<std::string>& explicitTurn
     before = SysUtils::getCurrentMillis();
     PROGRESS_BEGIN_MESSAGE("Processing turnarounds");
     if (!oc.getBool("no-turnarounds")) {
-        myEdgeCont.appendTurnarounds(oc.getBool("no-turnarounds.tls"), oc.getBool("no-turnarounds.except-deadend"));
+        myEdgeCont.appendTurnarounds(oc.getBool("no-turnarounds.tls"), oc.getBool("no-turnarounds.except-deadend"), oc.getBool("no-turnarounds.geometry"));
     } else {
         myEdgeCont.appendTurnarounds(explicitTurnarounds, oc.getBool("no-turnarounds.tls"));
     }