fix #14702 (not pretty)

eclipse-sumo · Apr 11, 2024 · 9fc0a98 · 9fc0a98
1 parent eaa7841
commit 9fc0a98
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 5 deletions.
diff --git a/src/netbuild/NBNode.cpp b/src/netbuild/NBNode.cpp
@@ -3505,7 +3505,7 @@ NBNode::buildWalkingAreas(int cornerDetail, double joinMinDist) {
         Crossing& prev = **it;
         Crossing& next = (it !=  validCrossings.begin() ? **(it - 1) :** (validCrossings.end() - 1));
         if (gDebugFlag1) {
-            std::cout << "  checkIntermediate: prev=" << prev.id << " next=" << next.id << " prev.nextWA=" << prev.nextWalkingArea << "\n";
+            std::cout << "  checkIntermediate: prev=" << prev.id << " next=" << next.id << " prev.nextWA=" << prev.nextWalkingArea << " next.prevWA=" << next.prevWalkingArea << "\n";
         }
         if (prev.nextWalkingArea == "") {
             if (next.prevWalkingArea != "" || &prev == &next) {
@@ -3874,6 +3874,20 @@ NBNode::getWalkingArea(const std::string& id) {
             return walkingArea;
         }
     }
+    // not found, maybe we need to rebuild
+    updateSurroundingGeometry();
+    sortEdges(true);
+    buildCrossingsAndWalkingAreas();
+    for (auto& walkingArea : myWalkingAreas) {
+        if (walkingArea.id == id) {
+            return walkingArea;
+        }
+    }
+    if (myWalkingAreas.size() > 0) {
+        // don't crash
+        WRITE_WARNINGF("Could not retrieve walkingarea '%' (edge ordering changed after recompute).", id);
+        return myWalkingAreas.front();
+    }
     throw ProcessError(TLF("Request for unknown walkingarea '%'.", id));
 }
 

diff --git a/src/netedit/changes/GNEChange_Crossing.cpp b/src/netedit/changes/GNEChange_Crossing.cpp
@@ -71,7 +71,14 @@ void GNEChange_Crossing::undo() {
         WRITE_DEBUG("removing " + toString(SUMO_TAG_CROSSING) + " from " + myJunctionParent->getTagStr() + " '" + myJunctionParent->getID() + "'");
         // unselect if mySelectedElement is enabled
         if (mySelectedElement) {
-            myJunctionParent->retrieveGNECrossing(myJunctionParent->getNBNode()->getCrossing(myEdges), false)->unselectAttributeCarrier();
+            GNECrossing* crossing = myJunctionParent->retrieveGNECrossing(myJunctionParent->getNBNode()->getCrossing(myEdges), false);
+            if (crossing) {
+                crossing->unselectAttributeCarrier();
+            } else {
+#ifdef _DEBUG
+                WRITE_WARNINGF("Unable to deselect crossing at junction '%' after undo", myJunctionParent->getID());
+#endif
+            }
         }
         // remove crossing of NBNode
         myJunctionParent->getNBNode()->removeCrossing(myEdges);
@@ -103,7 +110,16 @@ void GNEChange_Crossing::undo() {
         myJunctionParent->clearWalkingAreas();
         // select if mySelectedElement is enabled
         if (mySelectedElement) {
-            myJunctionParent->retrieveGNECrossing(c, false)->selectAttributeCarrier();
+            if (mySelectedElement) {
+                GNECrossing* crossing = myJunctionParent->retrieveGNECrossing(c, false);
+                if (crossing) {
+                    crossing->selectAttributeCarrier();
+                } else {
+#ifdef _DEBUG
+                    WRITE_WARNINGF("Unable to select crossing at junction '%' after undo", myJunctionParent->getID());
+#endif
+                }
+            }
         }
     }
     // enable save networkElements
@@ -129,14 +145,30 @@ void GNEChange_Crossing::redo() {
         myJunctionParent->clearWalkingAreas();
         // select if mySelectedElement is enabled
         if (mySelectedElement) {
-            myJunctionParent->retrieveGNECrossing(c, false)->selectAttributeCarrier();
+            if (mySelectedElement) {
+                GNECrossing* crossing = myJunctionParent->retrieveGNECrossing(c, false);
+                if (crossing) {
+                    crossing->selectAttributeCarrier();
+                } else {
+#ifdef _DEBUG
+                    WRITE_WARNINGF("Unable to select crossing at junction '%' after undo", myJunctionParent->getID());
+#endif
+                }
+            }
         }
     } else {
         // show extra information for tests
         WRITE_DEBUG("Removing " + toString(SUMO_TAG_CROSSING) + " from " + myJunctionParent->getTagStr() + " '" + myJunctionParent->getID() + "'");
         // unselect if mySelectedElement is enabled
         if (mySelectedElement) {
-            myJunctionParent->retrieveGNECrossing(myJunctionParent->getNBNode()->getCrossing(myEdges), false)->unselectAttributeCarrier();
+            GNECrossing* crossing = myJunctionParent->retrieveGNECrossing(myJunctionParent->getNBNode()->getCrossing(myEdges), false);
+            if (crossing) {
+                crossing->unselectAttributeCarrier();
+            } else {
+#ifdef _DEBUG
+                WRITE_WARNINGF("Unable to deselect crossing at junction '%' after undo", myJunctionParent->getID());
+#endif
+            }
         }
         // remove crossing of NBNode and update geometry
         myJunctionParent->getNBNode()->removeCrossing(myEdges);