Updated netedit test. Refs #3045

eclipse-sumo · Jan 6, 2025 · e0d0e22 · e0d0e22
1 parent 1503511
commit e0d0e22
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 38 deletions.
diff --git a/tests/netedit/attributesEnum.py b/tests/netedit/attributesEnum.py
@@ -3055,12 +3055,13 @@ class inspect:
         parameters = 11
 
     class inspectSelection:
-        type = 1
-        colorButton = 3
-        color = 4
-        departPos = 5
-        depart = 6
-        parameters = 9
+        typeButton = 1
+        type = 2
+        colorButton = 4
+        color = 5
+        departPos = 6
+        depart = 7
+        parameters = 10
 
 
 class personFlow:
@@ -3093,16 +3094,17 @@ class inspect:
         parameters = 18
 
     class inspectSelection:
-        type = 1
-        colorButton = 3
-        color = 4
-        departPos = 5
-        begin = 6
-        terminate = 9
-        spacing = 11
-        terminateOption = 13
-        spacingOption = 14
-        parameters = 16
+        typeButton = 1
+        type = 2
+        colorButton = 4
+        color = 5
+        departPos = 6
+        begin = 7
+        terminate = 10
+        spacing = 12
+        terminateOption = 14
+        spacingOption = 15
+        parameters = 17
 
 # PersonPlans
 
@@ -3666,12 +3668,13 @@ class inspect:
         parameters = 11
 
     class inspectSelection:
-        type = 1
-        colorButton = 3
-        color = 4
-        departPos = 5
-        depart = 6
-        parameters = 9
+        typeButton = 1
+        type = 2
+        colorButton = 4
+        color = 5
+        departPos = 6
+        depart = 7
+        parameters = 10
 
 
 class containerFlow:
@@ -3704,16 +3707,17 @@ class inspect:
         parameters = 18
 
     class inspectSelection:
-        type = 1
-        colorButton = 3
-        color = 4
-        departPos = 5
-        begin = 6
-        terminate = 9
-        spacing = 11
-        terminateOption = 13
-        spacingOption = 14
-        parameters = 16
+        typeButton = 1
+        type = 2
+        colorButton = 4
+        color = 5
+        departPos = 6
+        begin = 7
+        terminate = 10
+        spacing = 12
+        terminateOption = 14
+        spacingOption = 15
+        parameters = 17
 
 # PersonPlans
 

diff --git a/.../demands/containerflow/inspect_selection/flow_attributes/containersperhour/routes.netedit b/.../demands/containerflow/inspect_selection/flow_attributes/containersperhour/routes.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-29 13:08:10 by Eclipse SUMO netedit Version v1_20_0+1786-8c96f116c4d
+<!-- generated on 2025-01-06 11:15:24 by Eclipse SUMO netedit Version v1_21_0+1670-ab8067742d2
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -15,13 +15,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
-    <containerFlow id="cf_0" begin="10.00" departPos="0.00" color="red" end="3600.00" containersPerHour="25.99991333362222434289">
+    <containerFlow id="cf_0" begin="10.00" departPos="0.00" color="red" end="3600.00" containersPerHour="25">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
         <tranship from="Edge0" to="Edge1"/>
     </containerFlow>
-    <containerFlow id="cf_1" begin="12.00" departPos="11.00" color="blue" end="3800.00" containersPerHour="25.99991333362222434289">
+    <containerFlow id="cf_1" begin="12.00" departPos="11.00" color="blue" end="3800.00" containersPerHour="25">
         <param key="KeyB1" value="valueB1"/>
         <param key="KeyB2" value="valueB3"/>
         <param key="KeyB3" value="valueB2"/>

diff --git a/...ements/demands/personflow/inspect_selection/flow_attributes/personsperhour/routes.netedit b/...ements/demands/personflow/inspect_selection/flow_attributes/personsperhour/routes.netedit
@@ -1,17 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-02 14:45:56 by Eclipse SUMO netedit Version v1_18_0+2345-1e1f4673c2b
+<!-- generated on 2025-01-06 11:24:10 by Eclipse SUMO netedit Version v1_21_0+1670-ab8067742d2
+This data file and the accompanying materials
+are made available under the terms of the Eclipse Public License v2.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v20.html
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
-    <personFlow id="pf_0" begin="10.00" departPos="0.00" color="red" end="3600.00" personsPerHour="25.99991333362222434289">
+    <personFlow id="pf_0" begin="10.00" departPos="0.00" color="red" end="3600.00" personsPerHour="25">
         <param key="KeyA1" value="valueA1"/>
         <param key="KeyA2" value="valueA3"/>
         <param key="KeyA3" value="valueA2"/>
         <personTrip from="Edge0" to="Edge1"/>
     </personFlow>
-    <personFlow id="pf_1" begin="12.00" departPos="11.00" color="blue" end="3800.00" personsPerHour="25.99991333362222434289">
+    <personFlow id="pf_1" begin="12.00" departPos="11.00" color="blue" end="3800.00" personsPerHour="25">
         <param key="KeyB1" value="valueB1"/>
         <param key="KeyB2" value="valueB3"/>
         <param key="KeyB3" value="valueB2"/>