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

eclipse-sumo · Jan 16, 2025 · 5bdc6a1 · 5bdc6a1
2 parents 9c56ac0 + 2aac24a
commit 5bdc6a1
Show file tree

Hide file tree

Showing 339 changed files with 11,962 additions and 2,195 deletions.
diff --git a/docs/web/docs/ChangeLog.md b/docs/web/docs/ChangeLog.md
@@ -46,7 +46,9 @@ title: ChangeLog
   - Fixed inconsisent arrivalPos when loading state #15961
   - Fixed invalid stopping after vehicle teleports beyond stopping place #15972
   - Fixed bug where a vehicle steals another vehicles parking spot #15976
-  - Fixed bug where parking egress is blocked after lane change #15757 
+  - Fixed bug where parking egress is blocked after lane change #15757
+  - Fixed missing XML validation for parking badges #16005
+  - Fixed undefined behavior when using options **--device.rerouting.threads** with **--weights.random-factor** #15994 
 
 - netedit
   - Fixed crash when moving a big selection #15132 (regression in 1.16.0)
@@ -99,7 +101,9 @@ title: ChangeLog
   - Walkingareas no longer intercept clicks in in crossing mode #15916
   - Stop saving sumo/netedit config if a fix element dialog is opened #15918
   - Fixed Invalid behavior after loading demand elements with keep old enabled #15904
-  - Dotted contour no longer hides flow label and vehicle stack label #15929 
+  - Dotted contour no longer hides flow label and vehicle stack label #15929
+  - Fixed crash editing vClass in VType dialog #16008
+  - Selection mode function 'select parents' now selects incoming and outgoing lane of selected connections #15968 
 
 - sumo-gui
   - Fixed framerate drop when zoomed in very far #15666
@@ -148,25 +152,29 @@ title: ChangeLog
   - Fixed non-functional libsumo windows wheels #15516
   - setEmissionClass now works with PHEMlight #15761
   - subscribing to complex types now works with the python API #15785
-  - Concurrent access to libsumo now works #15967 
+  - Concurrent access to libsumo now works #15967
+  - moveToXY now works on parked vehicles #16010
+  - When setting option **--keep-after-arrival**, vehicles that were affected by moveToXY while parking are no longer drawn after arrival. #16009 
 
 - Tools
   - matsim_importPlans.py: no longer writes unsorted trips with option **-vehicles-only** #15743
   - generateBidiDistricts.py: Option **--radius** now takes effect regardless of edge length #15758
   - countEdgeUsage.py: Fixed misleading warning message #15790
   - sumolib: Fixed invalid result by `net.getShortestPath(..., ignoreDirection=True)` #15789
   - Sumolib: Fixed crash in function `miscutils.getFlowNumber` #15799
+  - sumolib: Can now set a new attribute in sumolib.xml element #15991 
   - sumolib.xml: Fixed bug where parse_fast retrieves wrong attribute if one attribute is the end-suffix of another attribute #15901 
   - randomTrips.py: option **--fringe-factor** now works in lefthand networks #15876
   - randomTrips.py: Options **--random-departpos** and **--random-arrivalpos** now take effect for persons #15946 
   - routeSampler.py: fixed crash when loading negative counts #15908
   - gtfs2pt.py: Import now works when optional 'direction_id' is missing #15736
-  - Empty strings can now be passed via tool config file #15499 
+  - Empty strings can now be passed via tool config file #15499
+  - tracemapper.py No longer creates routes with the same edge repeated over and over #15625 
 
 ### Enhancements
 
 - sumo
-  - Added new [stationfinder device](Simulation/Stationfinder.md) which reroutes electric vehicles to a chargingStation depending on it's state of charge #9663, #15871, #15931
+  - Added new [stationfinder device](Simulation/Stationfinder.md) which reroutes electric vehicles to a chargingStation depending on it's state of charge #9663, #15871, #15931, #15980
   - The new vType attribute `lcContRight` can be used to configure lane choice at a lane split where all lanes have equal strategic value. #15579
   - Added option **--insertion-checks** to set global defaults for vehicle attribute `insertionChecks` #15149
   - Added option **--pedestrian.striping.jamfactor** to configure the speed of jammed pedestrians (default 0.25) #15610
@@ -258,6 +266,11 @@ title: ChangeLog
   - routeSampler.py: Added option **--verbose.timing** to print wall-clock-time performance statistics #15910
   - routeSampler.py: Major increase in processing speed for long routes #15911
   - routeSampler.py: Added option **--depart-distribution** to distribute departures within the counting data intervals #15909
+  - routeSampler.py: now warn about duplicate counting data #15997
+  - routeSampler.py: now includes GEH in mismatch-output #16000
+  - routeSampler.py: Added option **--geh-scale** to permit custom scaling for GEH value (i.e. to avoid averaging daily counts over 24 hours) #16001
+  - edgeDataDiff.py: Added option **--geh-scale** to permit custom scaling for GEH value and otherwise scaling data to hourly values automatically #16002
+  - routeSampler.py: Options that set attributse to parse (i.e. **--edgedata-attribute**) now support a list of comma separated attributs (values are added) #16020 
   - xml2csv.py: Added option **--keep-attributes** to limit the attributes exported to csv #15915
   - plotXMLAttributes.py: Added options **--split-x** and **--split-y** for plotting attributes with list values #15934
   - sumolib: Geometry helper functions for rotation at offset is now available #15445

diff --git a/docs/web/docs/Simulation/Shapes.md b/docs/web/docs/Simulation/Shapes.md
@@ -73,7 +73,7 @@ position on this lane. So, the attributes have the following meanings:
 | type                  | string      | A typename for the poi.                                                                                                                                                                                |
 | layer                 | float       | the layer of the poi for drawing and selecting.                                                                                                                                                        |
 | imgFile               | string      | A bitmap to use for rendering this poi. If none is given, circle is drawn instead. The bitmap is tinted by the given color unless for white (*"1,1,1"*).                                               |
-| width                 | float       | width of rendered image in meters                                                                                                                                                                      |
+| width                 | float       | width of rendered image in meters, diameter of the POI when not loading an image |
 | height                | float       | height of rendered image in meters                                                                                                                                                                     |
 | angle                 | float       | angle of rendered image in degree                                                                                                                                                                      |
 

diff --git a/tests/netedit/attributesEnum.py b/tests/netedit/attributesEnum.py
@@ -19,6 +19,75 @@
 # GENERAL
 # --------------------------------
 
+class toolbar:
+    class file:
+        newNetwork = 1
+        newWindow = 2
+        generateNetwork = 3
+        loadNeteditConfig = 4
+        loadSumoConfig = 5
+        openNetwork = 6
+        openNetconvertConfiguration = 7
+        importForeignNetwork = 8
+        saveNetwork = 9
+        saveNetworkAs = 9
+        savePlainXML = 10
+        saveJoinedJunctions = 11
+        reloadConfig = 12
+        reloadNetwork = 13
+        class neteditConfig:
+            menu = 14
+            save = 1
+            saveAs = 2
+
+        class sumoConfig:
+            menu = 15
+            save = 1
+            saveAs = 2
+
+        class trafficLights:
+            menu = 16
+            load = 1
+            save = 2
+            saveAs = 3
+            reload = 4
+
+        class edgeTypes:
+            menu = 17
+            load = 1
+            save = 2
+            saveAs = 3
+            reload = 4
+
+        class aditionalElements:
+            menu = 18
+            load = 1
+            save = 2
+            saveAs = 3
+            saveJupedsim = 4
+            reload = 5
+
+        class demandElements:
+            menu = 19
+            load = 1
+            save = 2
+            saveAs = 3
+            reload = 4
+
+        class dataElements:
+            menu = 20
+            load = 1
+            save = 2
+            saveAs = 3
+            reload = 4
+
+        class meanDataElements:
+            menu = 21
+            load = 1
+            save = 2
+            saveAs = 3
+            reload = 4
+
 
 class editElements:
     overlapped = 5

diff --git a/tests/netedit/basic/configs/netccfg/load/modified/netedit.netecfg b/tests/netedit/basic/configs/netccfg/load/modified/netedit.netecfg
diff --git a/tests/netedit/basic/configs/netccfg/load/modified/output.netedit b/tests/netedit/basic/configs/netccfg/load/modified/output.netedit
diff --git a/tests/netedit/basic/configs/netccfg/load/modified/test.py b/tests/netedit/basic/configs/netccfg/load/modified/test.py
diff --git a/tests/netedit/basic/configs/netccfg/load/non_modified/meandatas.netedit b/tests/netedit/basic/configs/netccfg/load/non_modified/meandatas.netedit
diff --git a/tests/netedit/basic/configs/netccfg/load/non_modified/output.netedit b/tests/netedit/basic/configs/netccfg/load/non_modified/output.netedit
diff --git a/tests/netedit/basic/configs/netccfg/load/non_modified/routes.netedit b/tests/netedit/basic/configs/netccfg/load/non_modified/routes.netedit
diff --git a/tests/netedit/basic/configs/netccfg/load/testsuite.netedit b/tests/netedit/basic/configs/netccfg/load/testsuite.netedit
diff --git a/tests/netedit/basic/configs/netccfg/load/testsuite.neteditcheckoutput b/tests/netedit/basic/configs/netccfg/load/testsuite.neteditcheckoutput