fix #3824

eclipse-sumo · Feb 19, 2018 · 08ab7e7 · 08ab7e7
1 parent bbb81ba
commit 08ab7e7
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/src/netbuild/NBLoadedSUMOTLDef.cpp b/src/netbuild/NBLoadedSUMOTLDef.cpp
@@ -71,6 +71,11 @@ NBLoadedSUMOTLDef::NBLoadedSUMOTLDef(NBTrafficLightDefinition* def, NBTrafficLig
     assert(def->getType() == logic->getType());
     myControlledLinks = def->getControlledLinks();
     myControlledNodes = def->getNodes();
+    NBLoadedSUMOTLDef* sumoDef = dynamic_cast<NBLoadedSUMOTLDef*>(def);
+    if (sumoDef != 0) {
+        myReconstructAddedConnections = sumoDef->myReconstructAddedConnections;
+        myReconstructRemovedConnections = sumoDef->myReconstructRemovedConnections;
+    }
 }
 
 
@@ -435,15 +440,15 @@ NBLoadedSUMOTLDef::reconstructLogic() {
     const bool netedit = NBNetBuilder::runningNetedit();
 #ifdef DEBUG_RECONSTRUCTION
     bool debugPrintModified = myReconstructAddedConnections || myReconstructRemovedConnections;
-    std::cout << " reconstructLogic added=" << myReconstructAddedConnections << " removed=" << myReconstructRemovedConnections << " oldLinks:\n";
+    std::cout << " reconstructLogic added=" << myReconstructAddedConnections << " removed=" << myReconstructRemovedConnections << " valid=" << hasValidIndices() << " oldLinks:\n";
     for (NBConnectionVector::iterator it = myControlledLinks.begin(); it != myControlledLinks.end(); ++it) {
         std::cout << "    " << *it << "\n";
     }
 #endif
     if (myReconstructAddedConnections) {
         myReconstructAddedConnections = false;
         // do not rebuild the logic when running netedit and all links are already covered by the program
-        if (!myPhasesLoaded && (!netedit || getMaxIndex() >= myTLLogic->getNumLinks())) {
+        if (!myPhasesLoaded && !(netedit && hasValidIndices())) {
             // rebuild the logic from scratch
             // XXX if a connection with the same from- and to-edge already exisits, its states could be copied instead
             NBOwnTLDef dummy(DummyID, myControlledNodes, 0, TLTYPE_STATIC);
@@ -463,6 +468,13 @@ NBLoadedSUMOTLDef::reconstructLogic() {
                 newLogic->setType(getType());
                 newLogic->setOffset(getOffset());
                 setTLControllingInformation();
+                // reset crossing custom indices 
+                for (NBNode* n : myControlledNodes) {
+                    for (NBNode::Crossing* c : n->getCrossings()) {
+                        c->customTLIndex = NBConnection::InvalidTlIndex;
+                    }
+                }
+
             }
         } else {
             setTLControllingInformation();
@@ -485,7 +497,7 @@ NBLoadedSUMOTLDef::reconstructLogic() {
                 const int removed = con.getTLIndex();
                 it = myControlledLinks.erase(it);
                 // no automatic modificaions when running netedit
-                if (!myPhasesLoaded && !netedit) {
+                if (!myPhasesLoaded && !(netedit && hasValidIndices())) {
                     // shift index off successive connections and remove entry from all phases if the tlIndex was only used by this connection
                     bool exclusive = true;
                     for (NBConnection& other : myControlledLinks) {
@@ -550,6 +562,23 @@ NBLoadedSUMOTLDef::getMaxIndex() const {
     return maxIndex;
 }
 
+bool 
+NBLoadedSUMOTLDef::hasValidIndices() const {
+    for (const NBConnection& c : myControlledLinks) {
+        if (c.getTLIndex() == NBConnection::InvalidTlIndex) {
+            return false;
+        }
+    }
+    for (NBNode* n : myControlledNodes) {
+        for (NBNode::Crossing* c : n->getCrossings()) {
+            if (c->tlLinkIndex == NBConnection::InvalidTlIndex) {
+                return false;
+            }
+        }
+    }
+    return getMaxIndex() < myTLLogic->getNumLinks();
+}
+
 
 bool
 NBLoadedSUMOTLDef::cleanupStates() {

diff --git a/src/netbuild/NBLoadedSUMOTLDef.h b/src/netbuild/NBLoadedSUMOTLDef.h
@@ -198,6 +198,9 @@ class NBLoadedSUMOTLDef : public NBTrafficLightDefinition {
 
     /// @brief return the highest known tls link index used by any controlled connection or crossing
     int getMaxIndex() const;
+
+    /// @brief return whether all tls link indices are valid
+    bool hasValidIndices() const;
 
 private:
     /// @brief class for identifying connections

diff --git a/src/netedit/GNEJunction.cpp b/src/netedit/GNEJunction.cpp
@@ -695,6 +695,12 @@ GNEJunction::invalidateTLS(GNEUndoList* undoList, const NBConnection& deletedCon
                 repl->removeConnection(deletedConnection);
                 replacementDef = repl;
             } else if (addedConnection != NBConnection::InvalidConnection) {
+                if (addedConnection.getTLIndex() == NBConnection::InvalidTlIndex) {
+                    // custom tl indices of crossings might become invalid upon recomputation so we must save them
+                    for (GNECrossing* c : myGNECrossings) {
+                        undoList->add(new GNEChange_Attribute(c, SUMO_ATTR_TLLINKINDEX, toString(NBConnection::InvalidTlIndex)), true);
+                    }
+                }
                 NBLoadedSUMOTLDef* repl = new NBLoadedSUMOTLDef(tlDef, tlDef->getLogic());
                 repl->addConnection(addedConnection.getFrom(), addedConnection.getTo(),
                         addedConnection.getFromLane(), addedConnection.getToLane(), addedConnection.getTLIndex());