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

Author: palvarezlopez

.appveyor.yml

@@ -6,12 +6,12 @@ skip_commits:
 
 environment:
     matrix:
-        # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-        #   ver: 2015
-        #   generator: "Visual Studio 14 2015 Win64"
-        #   configuration: Release
-        #   cmake_opts: "-DENABLE_JAVA_BINDINGS=0 -DNETEDIT=0"
-        #   PYTHON: C:\Python38-x64
+        - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+          ver: 2015
+          generator: "Visual Studio 14 2015 Win64"
+          configuration: Release
+          cmake_opts: "-DENABLE_JAVA_BINDINGS=0 -DNETEDIT=0"
+          PYTHON: C:\Python38-x64
         - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
           ver: 2017
           generator: "Visual Studio 15 2017 Win64"

.github/workflows/build-macos.yml

@@ -36,6 +36,8 @@ jobs:
       run: |
         brew update
         brew upgrade || brew link --overwrite [email protected]
+        # Temporarily uninstall [email protected] to work around https://github.com/actions/runner-images/issues/10984
+        brew uninstall --ignore-dependencies --force [email protected]
         brew install --cask xquartz
         brew install xerces-c fox proj gdal gl2ps ccache googletest fmt swig eigen
 

.github/workflows/documentation.yml

@@ -55,7 +55,6 @@ jobs:
         path: .lycheecache
         key: cache-lychee-${{ github.sha }}
         restore-keys: cache-lychee-
-        save-always: true
 
     - name: Cloning repository
       uses: actions/checkout@v4

CMakeLists.txt

@@ -384,8 +384,10 @@ if (SUMO_LIBRARIES AND WIN32)
         file(GLOB MSVC_DLLS "${SUMO_LIBRARIES}/runtimes/*.dll")
         list(APPEND SUMO_LIBRARIES_DLL ${MSVC_DLLS})
     endif(INSTALL_DLL_RUNTIMES)
-    # set fmt dir depending of msvc toolset version
-    file(GLOB fmt_PATH "${SUMO_LIBRARIES}/3rdPartyLibs/fmt-??.?.?")
+    if (MSVC_VERSION GREATER 1919)
+        # fmt in SUMOLibraries only works with MSVC 2019 and later
+        file(GLOB fmt_PATH "${SUMO_LIBRARIES}/3rdPartyLibs/fmt-??.?.?")
+    endif ()
     # declare flag for use google test
     set(USE_GOOGLETEST true)
     # check if use google test

docs/web/docs/Data/Scenarios/TAPASCologne.md

@@ -163,7 +163,7 @@ The below images show the structure of demand data over 24 hour period.
 This shows normal behavior of mobility. Peak hours like \~8-9am ,
 \~4-6pm during which the number of trips are usually high. More
 information of the city of cologne can be found in the link
-[\[1\]](https://www.stadt-koeln.de/mediaasset/content/pdf15/stadtkoeln_zahlenspiegel_e_bfrei.pdf).
+[\[1\]](https://web.archive.org/web/20230321021848/https://www.stadt-koeln.de/mediaasset/content/pdf15/stadtkoeln_zahlenspiegel_e_bfrei.pdf).
 The total number of trips (made by cars) over 24h is very close to the
 number of registered cars\*3 (3 trips per registered car). There are
 around \~420415\*3 (\~1.2 million) trips which matches the number in the

docs/web/docs/Simulation/Output/QueueOutput.md

@@ -10,7 +10,8 @@ using the end of the last standing vehicle.
 
 The simulation is forced to generate this output using the option **--queue-output** {{DT_FILE}}. {{DT_FILE}} is
 the name of the file the output will be written to. Any other file with
-this name will be overwritten, the destination folder must exist.
+this name will be overwritten, the destination folder must exist. Using the option **--qeue-output.period** {{DT_TIME}}, the times 
+the queue lengths will be written can be restricted to the given period. Then, the other time steps will be skipped.
 
 ## Generated Output
 

docs/web/theme/nav-sub.html

@@ -1,3 +1,4 @@
+<!-- sonar-ignore-start -->
 {%- if not nav_item.children %}
 <li>
     <a href="{{ nav_item.url|url }}" class="dropdown-item{% if nav_item.active %} active{% endif %}">{{ nav_item.title }}</a>
@@ -12,3 +13,4 @@
     </ul>
   </li>
 {%- endif %}
+<!-- sonar-ignore-end -->

src/activitygen/city/AGCity.cpp

@@ -109,7 +109,7 @@ AGCity::generateWorkPositions() {
                 ++workPositionCounter;
             }
         }
-    } catch (const std::bad_alloc& e) {
+    } catch (const std::bad_alloc&) {
         std::cout << "Number of work positions at bad_alloc exception: " << workPositionCounter << std::endl;
         throw;
     }

src/dfrouter/RODFDetectorHandler.cpp

@@ -89,7 +89,7 @@ RODFDetectorHandler::myStartElement(int element,
             if (myIgnoreErrors) {
                 WRITE_WARNING(e.what());
             } else {
-                throw e;
+                throw;
             }
         }
     }

src/mesosim/METriggeredCalibrator.cpp

@@ -194,7 +194,7 @@ METriggeredCalibrator::execute(SUMOTime currentTime) {
                         vehicle = nullptr;
                         break;
                     } else {
-                        throw e;
+                        throw;
                     }
                 }
                 const bool duplicate = vc.getVehicle(newPars->id) != nullptr;