Merge branch 'main' of github.com:eclipse-sumo/sumo into Netedit_dev

eclipse-sumo · Feb 3, 2025 · 8c24bb7 · 8c24bb7
2 parents 02b9f18 + 82cb89a
commit 8c24bb7
Show file tree

Hide file tree

Showing 101 changed files with 1,620 additions and 1,321 deletions.
diff --git a/src/netedit/GNEApplicationWindow.cpp b/src/netedit/GNEApplicationWindow.cpp
@@ -1603,7 +1603,15 @@ void
 GNEApplicationWindow::loadOptionOnStartup() {
     auto& neteditOptions = OptionsCont::getOptions();
     if (neteditOptions.getBool("new")) {
+        // save output file
+        const auto outputFile = neteditOptions.getString("output-file");
+        // create new network reset all options
         createNewNetwork();
+        // check if define output file
+        if (!outputFile.empty()) {
+            neteditOptions.resetWritable();
+            neteditOptions.set("net-file", outputFile);
+        }
     } else {
         // set flag
         myAmLoading = true;

diff --git a/tests/netedit/bugs/testsuite.netedit b/tests/netedit/bugs/testsuite.netedit
@@ -3,20 +3,8 @@
 # due a call to computesinglenode(...)
 revision24081
 
-# loading a net.xml with prohibitions and deleting edges fails
-ticket1711
-
 # crash on opening lefthand network
 ticket3900
 
 # after recomputing green verge change to bikelanes
 ticket4528
-
-# crash after sequence of undo-redo, recomputings and join junctions
-ticket5552
-
-# Crash after undo lane deletion
-ticket10588
-
- # Crash after undo edge deletion
-ticket10591
diff --git a/tests/netedit/bugs/testsuite.neteditcheckoutput b/tests/netedit/bugs/testsuite.neteditcheckoutput
@@ -3,20 +3,8 @@
 # due a call to computesinglenode(...)
 revision24081
 
-# loading a net.xml with prohibitions and deleting edges fails
-ticket1711
-
 # crash on opening lefthand network
 ticket3900
 
 # after recomputing green verge change to bikelanes
 ticket4528
-
-# crash after sequence of undo-redo, recomputings and join junctions
-ticket5552
-
-# Crash after undo lane deletion
-ticket10588
-
- # Crash after undo edge deletion
-ticket10591
diff --git a/tests/netedit/bugs/ticket10588/net.typ.xml b/tests/netedit/bugs/ticket10588/net.typ.xml
diff --git a/tests/netedit/bugs/ticket10591/net.typ.xml b/tests/netedit/bugs/ticket10591/net.typ.xml
diff --git a/tests/netedit/bugs/ticket1711/log.netedit b/tests/netedit/bugs/ticket1711/log.netedit